david/euchre_camp
Public Access
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

fix: fix justfile docker-tag task and add git commit tag to fast rebuild

Browse Source
This commit is contained in:
David Gwilliam
2026-03-31 10:05:41 -07:00
parent ea40f79c55
commit b5a6d9fd7d
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
justfile
+11 -13
View File
@@ -16,11 +16,8 @@ IMAGE_TAG := "latest"
# Get git commit hash (short version) # Get git commit hash (short version)
GIT_COMMIT := `git rev-parse --short HEAD` GIT_COMMIT := `git rev-parse --short HEAD`
# Image tag with git commit # Image tag with git commit (use same format as GIT_COMMIT)
IMAGE_TAG_COMMIT := "{{GIT_COMMIT}}" IMAGE_TAG_COMMIT := `git rev-parse --short HEAD`
# Full image name with registry
REGISTRY_IMAGE := "{{REGISTRY}}/{{PROJECT}}"
# --- Variables --- # --- Variables ---
# Database # Database
@@ -105,6 +102,7 @@ docker-rebuild-fast:
DOCKER_BUILDKIT=1 docker build \ DOCKER_BUILDKIT=1 docker build \
--cache-from={{PROJECT}}:{{IMAGE_TAG}} \ --cache-from={{PROJECT}}:{{IMAGE_TAG}} \
-t {{PROJECT}}:{{IMAGE_TAG}} \ -t {{PROJECT}}:{{IMAGE_TAG}} \
-t {{PROJECT}}:{{IMAGE_TAG_COMMIT}} \
. .
# Run the Docker container locally # Run the Docker container locally
@@ -128,19 +126,19 @@ docker-clean: docker-stop
# Tag image for registry # Tag image for registry
docker-tag: docker-tag:
@echo "Tagging image for registry..." @echo "Tagging image for registry..."
echo "Tagging {{PROJECT}}:{{IMAGE_TAG}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}" docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}} || true
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}} || true
echo "Tagging {{PROJECT}}:{{IMAGE_TAG_COMMIT}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}" @echo "Tagged {{PROJECT}}:{{IMAGE_TAG}} -> {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}}"
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true @echo "Tagged {{PROJECT}}:{{IMAGE_TAG_COMMIT}} -> {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}}"
# Push image to registry (builds, tags, and pushes) # Push image to registry (builds, tags, and pushes)
docker-push: docker-build-full docker-push: docker-build-full
@echo "Tagging images for registry..." @echo "Tagging images for registry..."
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}} || true
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}} || true
@echo "Pushing images to {{REGISTRY}}..." @echo "Pushing images to {{REGISTRY}}..."
docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} docker push {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}}
docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} docker push {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}}
# --- CI/CD Pipeline Simulation --- # --- CI/CD Pipeline Simulation ---