fix: fix justfile docker-tag task and add git commit tag to fast rebuild
This commit is contained in:
@@ -16,11 +16,8 @@ IMAGE_TAG := "latest"
|
||||
# Get git commit hash (short version)
|
||||
GIT_COMMIT := `git rev-parse --short HEAD`
|
||||
|
||||
# Image tag with git commit
|
||||
IMAGE_TAG_COMMIT := "{{GIT_COMMIT}}"
|
||||
|
||||
# Full image name with registry
|
||||
REGISTRY_IMAGE := "{{REGISTRY}}/{{PROJECT}}"
|
||||
# Image tag with git commit (use same format as GIT_COMMIT)
|
||||
IMAGE_TAG_COMMIT := `git rev-parse --short HEAD`
|
||||
|
||||
# --- Variables ---
|
||||
# Database
|
||||
@@ -105,6 +102,7 @@ docker-rebuild-fast:
|
||||
DOCKER_BUILDKIT=1 docker build \
|
||||
--cache-from={{PROJECT}}:{{IMAGE_TAG}} \
|
||||
-t {{PROJECT}}:{{IMAGE_TAG}} \
|
||||
-t {{PROJECT}}:{{IMAGE_TAG_COMMIT}} \
|
||||
.
|
||||
|
||||
# Run the Docker container locally
|
||||
@@ -128,19 +126,19 @@ docker-clean: docker-stop
|
||||
# Tag image for registry
|
||||
docker-tag:
|
||||
@echo "Tagging image for registry..."
|
||||
echo "Tagging {{PROJECT}}:{{IMAGE_TAG}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}"
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true
|
||||
echo "Tagging {{PROJECT}}:{{IMAGE_TAG_COMMIT}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}"
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}} || true
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}} || true
|
||||
@echo "Tagged {{PROJECT}}:{{IMAGE_TAG}} -> {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}}"
|
||||
@echo "Tagged {{PROJECT}}:{{IMAGE_TAG_COMMIT}} -> {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}}"
|
||||
|
||||
# Push image to registry (builds, tags, and pushes)
|
||||
docker-push: docker-build-full
|
||||
@echo "Tagging images for registry..."
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}} || true
|
||||
docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}} || true
|
||||
@echo "Pushing images to {{REGISTRY}}..."
|
||||
docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}
|
||||
docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}
|
||||
docker push {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG}}
|
||||
docker push {{REGISTRY}}/{{PROJECT}}:{{IMAGE_TAG_COMMIT}}
|
||||
|
||||
# --- CI/CD Pipeline Simulation ---
|
||||
|
||||
|
||||
Reference in New Issue
Block a user