Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to master - GTC-2958 #596

Merged
merged 9 commits into from
Oct 21, 2024
Merged

Merge develop to master - GTC-2958 #596

merged 9 commits into from
Oct 21, 2024

Conversation

danscales
Copy link
Collaborator

Merge change for GTC-2958 from Develop to Master

GTC-2958 Tag Docker image from docker hash, so it always exists

Currently, we tag the new Docker image with the current Git SHA. But the
container_registry module only creates a new Docker image if the docker
contents change. So, if the docker contents haven't changed with this
Git change, we can have a bug where we reference the app docker via a
tag (of the new Git SHA) which doesn't exist.

The fix is to use instead as a tag the hash of the docker contents. We
use the same hash script that the container_registry module uses.
Therefore, we will always be using a tag that exists, either because the
container_register module just pushed a new docker with the new tag, or
the docker already exists under the docker hash tag, because the docker
contents and has haven't changed.

danscales and others added 9 commits October 1, 2024 09:30
Currently, we tag the new Docker image with the current Git SHA. But the
container_registry module only creates a new Docker image if the docker
contents change. So, if the docker contents haven't changed with this
Git change, we can have a bug where we reference the app docker via a
tag (of the new Git SHA) which doesn't exist.

The fix is to use instead as a tag the hash of the docker contents. We
use the same hash script that the container_registry module uses.
Therefore, we will always be using a tag that exists, either because the
container_register module just pushed a new docker with the new tag, or
the docker already exists under the docker hash tag, because the docker
contents and has haven't changed.

I noticed a bunch of bugs in the container_registry module's hash.sh
script, which I will fix later. One of the main things is that it
doesn't ignore comments, so it can match on words in the comments. For
that reason, I removed the '# Docker Files' comment, which was causing
the Dockerfile itself to be ignored during hashing.
GTC-2958 Tag Docker image from docker hash, so it always exists
GTC-3001: Use new pixetl version with support for large datasets
I ran a full test using the DIST-Alerts, and it seems like the tile
files are generally much smaller, so there could be a bug.
Back out use of new pixetl docker using hard links to reduce disk space
@danscales danscales merged commit 1eacc4d into master Oct 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants