Skip to content

Add short git hash to Docker image tags #865

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.

Sign up for GitHub

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

Merged
kmontemayor2-sc merged 3 commits into from
Nov 6, 2026
Merged

Add short git hash to Docker image tags #865

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c6cb45
Add short git hash to Docker image tags
kmonte Oct 29, 2026
483c299
Merge remote-tracking branch 'origin/main' into kmonte/docker_image_t…
kmonte Nov 5, 2026
0c4a994
Merge branch 'main' into kmonte/docker_image_tag_with_short_hash
kmontemayor2-sc Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ DATE:=$(shell /bin/date "+%Y%m%d_%H%M")

# GIT HASH, or empty string if not in a git repo.
GIT_HASH?=$(shell git rev-parse HEAD 2>/dev/null || "")
SHORT_GIT_HASH?=$(shell git rev-parse --short HEAD 2>/dev/null || "")
# Docker image tag. The artifact registry enforces tag immutability, so a date alone can
# collide when a build is retried or two builds start in the same minute. The short hash
# makes the tag unique per commit.
DOCKER_IMAGE_TAG?=${DATE}_${SHORT_GIT_HASH}
PWD=$(shell pwd)

# You can override GIGL_PROJECT by setting it in your environment i.e.
Expand All @@ -16,17 +21,17 @@ DOCKER_IMAGE_MAIN_CUDA_NAME:=${GIGL_DOCKER_ARTIFACT_REGISTRY}/src-cuda
DOCKER_IMAGE_MAIN_CPU_NAME:=${GIGL_DOCKER_ARTIFACT_REGISTRY}/src-cpu
DOCKER_IMAGE_DEV_WORKBENCH_NAME:=${GIGL_DOCKER_ARTIFACT_REGISTRY}/dev-workbench

DOCKER_IMAGE_DATAFLOW_RUNTIME_NAME_WITH_TAG?=${DOCKER_IMAGE_DATAFLOW_RUNTIME_NAME}:${DATE}
DOCKER_IMAGE_MAIN_CUDA_NAME_WITH_TAG?=${DOCKER_IMAGE_MAIN_CUDA_NAME}:${DATE}
DOCKER_IMAGE_MAIN_CPU_NAME_WITH_TAG?=${DOCKER_IMAGE_MAIN_CPU_NAME}:${DATE}
DOCKER_IMAGE_DEV_WORKBENCH_NAME_WITH_TAG?=${DOCKER_IMAGE_DEV_WORKBENCH_NAME}:${DATE}
DOCKER_IMAGE_DATAFLOW_RUNTIME_NAME_WITH_TAG?=${DOCKER_IMAGE_DATAFLOW_RUNTIME_NAME}:${DOCKER_IMAGE_TAG}
DOCKER_IMAGE_MAIN_CUDA_NAME_WITH_TAG?=${DOCKER_IMAGE_MAIN_CUDA_NAME}:${DOCKER_IMAGE_TAG}
DOCKER_IMAGE_MAIN_CPU_NAME_WITH_TAG?=${DOCKER_IMAGE_MAIN_CPU_NAME}:${DOCKER_IMAGE_TAG}
DOCKER_IMAGE_DEV_WORKBENCH_NAME_WITH_TAG?=${DOCKER_IMAGE_DEV_WORKBENCH_NAME}:${DOCKER_IMAGE_TAG}

# Image built and used by `make integration_test`. The tag defaults to ${DATE} for local
# Image built and used by `make integration_test`. The tag defaults to ${DOCKER_IMAGE_TAG} for local
# runs; CI overrides INTEGRATION_TEST_CPU_IMAGE_TAG with an immutable per-run value (e.g.
# ${GITHUB_RUN_ID}.${GITHUB_RUN_ATTEMPT}) so concurrent runs can't overwrite each
# other's tag. `?=` keeps INTEGRATION_TEST_CPU_IMAGE lazily expanded so a CLI override of
# the tag flows through to both the build and the GIGL_CPU_DOCKER_URI export.
INTEGRATION_TEST_CPU_IMAGE_TAG?=${DATE}
INTEGRATION_TEST_CPU_IMAGE_TAG?=${DOCKER_IMAGE_TAG}
INTEGRATION_TEST_CPU_IMAGE?=${DOCKER_IMAGE_MAIN_CPU_NAME}:${INTEGRATION_TEST_CPU_IMAGE_TAG}

PYTHON_DIRS:=.github/scripts examples gigl tests snapchat scripts
Expand Down