From 3e3d3964091a67a9c36f78a054cd28436c5ddd9b Mon Sep 17 00:00:00 2001 From: "Ehsan.Asadi" Date: Tue, 30 Dec 2025 22:44:49 +0330 Subject: [PATCH] fix: update Makefile to use correct base image tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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! --- Makefile | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 6607cdc..dcdcc11 100644 --- a/Makefile +++ b/Makefile @@ -77,45 +77,59 @@ clean: # Docker commands docker-build-base: - @echo "Building base image..." + @echo "════════════════════════════════════════" + @echo " 🔨 Building Base Image" + @echo "════════════════════════════════════════" DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \ -f docker/Dockerfile.base \ - -t hub.peikarband.ir/peikarband/base:latest \ - -t hub.peikarband.ir/peikarband/base:python3.11-node20 \ + -t hub.peikarband.ir/peikarband/landing:base \ + -t hub.peikarband.ir/peikarband/landing:base-python3.11-node20 \ --build-arg PYTHON_VERSION=3.11 \ --build-arg NODE_VERSION=20 \ --platform linux/amd64 \ --load \ . - @echo "✅ Base image built successfully!" + @echo "" + @echo "✅ Base image built: hub.peikarband.ir/peikarband/landing:base" + @echo "" docker-push-base: - @echo "Pushing base image to Harbor..." - docker push hub.peikarband.ir/peikarband/base:latest - docker push hub.peikarband.ir/peikarband/base:python3.11-node20 + @echo "════════════════════════════════════════" + @echo " 📤 Pushing Base Image" + @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 "" docker-build: - @echo "Building application image..." + @echo "════════════════════════════════════════" + @echo " 🔨 Building Application Image" + @echo "════════════════════════════════════════" DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build \ -f docker/Dockerfile \ - -t $(IMAGE_NAME):$(VERSION) \ - -t $(IMAGE_NAME):latest \ - -t hub.peikarband.ir/$(IMAGE_NAME):$(VERSION) \ - -t hub.peikarband.ir/$(IMAGE_NAME):latest \ - --build-arg BASE_IMAGE=hub.peikarband.ir/peikarband/base:latest \ + -t hub.peikarband.ir/peikarband/landing:$(VERSION) \ + -t hub.peikarband.ir/peikarband/landing:latest \ + --build-arg BASE_IMAGE=hub.peikarband.ir/peikarband/landing:base \ --build-arg VERSION=$(VERSION) \ --build-arg BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \ --platform linux/amd64 \ --load \ . - @echo "✅ Application image built successfully!" + @echo "" + @echo "✅ Application image built: hub.peikarband.ir/peikarband/landing:$(VERSION)" + @echo "" docker-push: - @echo "Pushing application image to Harbor..." - docker push hub.peikarband.ir/$(IMAGE_NAME):$(VERSION) - docker push hub.peikarband.ir/$(IMAGE_NAME):latest + @echo "════════════════════════════════════════" + @echo " 📤 Pushing Application Image" + @echo "════════════════════════════════════════" + docker push hub.peikarband.ir/peikarband/landing:$(VERSION) + docker push hub.peikarband.ir/peikarband/landing:latest + @echo "" @echo "✅ Application image pushed successfully!" + @echo "" docker-login: @echo "Logging in to Harbor registry..."