ehsan-minadd/peikarband
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: update Makefile to use correct base image tag
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse Source 
Base image now uses same repo with 'base' tag:
• hub.peikarband.ir/peikarband/landing:base
• hub.peikarband.ir/peikarband/landing:base-python3.11-node20

App image:
• hub.peikarband.ir/peikarband/landing:latest
• hub.peikarband.ir/peikarband/landing:{version}

All in same repository!
This commit is contained in:
Ehsan.Asadi
2025-12-30 22:44:49 +03:30
parent cf6fcd4dfe
commit 3e3d396409
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Makefile
View File

@@ -77,45 +77,59 @@ clean:
# Docker commands # Docker commands
docker-build-base: docker-build-base:
@echo "Building base image..." @echo "════════════════════════════════════════"
@echo " 🔨 Building Base Image"
@echo "════════════════════════════════════════"
DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \ DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \
-f docker/Dockerfile.base \ -f docker/Dockerfile.base \
-t hub.peikarband.ir/peikarband/base:latest \ -t hub.peikarband.ir/peikarband/landing:base \
-t hub.peikarband.ir/peikarband/base:python3.11-node20 \ -t hub.peikarband.ir/peikarband/landing:base-python3.11-node20 \
--build-arg PYTHON_VERSION=3.11 \ --build-arg PYTHON_VERSION=3.11 \
--build-arg NODE_VERSION=20 \ --build-arg NODE_VERSION=20 \
--platform linux/amd64 \ --platform linux/amd64 \
--load \ --load \
. .
@echo "✅ Base image built successfully!" @echo ""
@echo "✅ Base image built: hub.peikarband.ir/peikarband/landing:base"
@echo ""
docker-push-base: docker-push-base:
@echo "Pushing base image to Harbor..." @echo "════════════════════════════════════════"
docker push hub.peikarband.ir/peikarband/base:latest @echo " 📤 Pushing Base Image"
docker push hub.peikarband.ir/peikarband/base:python3.11-node20 @echo "════════════════════════════════════════"
docker push hub.peikarband.ir/peikarband/landing:base
docker push hub.peikarband.ir/peikarband/landing:base-python3.11-node20
@echo ""
@echo "✅ Base image pushed successfully!" @echo "✅ Base image pushed successfully!"
@echo ""
docker-build: docker-build:
@echo "Building application image..." @echo "════════════════════════════════════════"
@echo " 🔨 Building Application Image"
@echo "════════════════════════════════════════"
DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \ DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \
-f docker/Dockerfile \ -f docker/Dockerfile \
-t $(IMAGE_NAME):$(VERSION) \ -t hub.peikarband.ir/peikarband/landing:$(VERSION) \
-t $(IMAGE_NAME):latest \ -t hub.peikarband.ir/peikarband/landing:latest \
-t hub.peikarband.ir/$(IMAGE_NAME):$(VERSION) \ --build-arg BASE_IMAGE=hub.peikarband.ir/peikarband/landing:base \
-t hub.peikarband.ir/$(IMAGE_NAME):latest \
--build-arg BASE_IMAGE=hub.peikarband.ir/peikarband/base:latest \
--build-arg VERSION=$(VERSION) \ --build-arg VERSION=$(VERSION) \
--build-arg BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
--platform linux/amd64 \ --platform linux/amd64 \
--load \ --load \
. .
@echo "✅ Application image built successfully!" @echo ""
@echo "✅ Application image built: hub.peikarband.ir/peikarband/landing:$(VERSION)"
@echo ""
docker-push: docker-push:
@echo "Pushing application image to Harbor..." @echo "════════════════════════════════════════"
docker push hub.peikarband.ir/$(IMAGE_NAME):$(VERSION) @echo " 📤 Pushing Application Image"
docker push hub.peikarband.ir/$(IMAGE_NAME):latest @echo "════════════════════════════════════════"
docker push hub.peikarband.ir/peikarband/landing:$(VERSION)
docker push hub.peikarband.ir/peikarband/landing:latest
@echo ""
@echo "✅ Application image pushed successfully!" @echo "✅ Application image pushed successfully!"
@echo ""
docker-login: docker-login:
@echo "Logging in to Harbor registry..." @echo "Logging in to Harbor registry..."