try and get the labels right

phusion · Jul 17, 2024 · 49de9db · 49de9db
1 parent 881beac
commit 49de9db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/dockerimage-ci.yml b/.github/workflows/dockerimage-ci.yml
@@ -88,11 +88,11 @@ jobs:
     - name: Fix docker logs
       run: docker buildx create --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1,env.BUILDKIT_STEP_LOG_MAX_SPEED=-1,default-load=true --use
     - name: Build the Docker images
-      run: make "OWNER=$OWNER_LC" VERSION=edge
-    - name: Cross tag
-      run: docker tag "$OWNER_LC/holy-build-box:edge" "ghcr.io/$OWNER_LC/holy-build-box:edge"
+      run: make "OWNER=$OWNER_LC" VERSION=edge build
     - name: Push the Docker images
-      run: docker push "ghcr.io/$OWNER_LC/holy-build-box:edge"
+      run: make "OWNER=$OWNER_LC" VERSION=edge push
+    - name: Push the Docker manifest
+      run: make "OWNER=$OWNER_LC" VERSION=edge release
 
   build_release:
     name: "Build release Docker images"

diff --git a/Makefile b/Makefile
@@ -5,7 +5,14 @@ endif
 
 OWNER = phusion
 DISABLE_OPTIMIZATIONS = 0
-IMAGE = $(OWNER)/holy-build-box
+
+ifeq ($(GITHUB_ACTIONS),true)
+IMG_REPO = ghcr.io
+else
+IMG_REPO = docker.io
+endif
+
+IMAGE = $(IMG_REPO)/$(OWNER)/holy-build-box
 
 .PHONY: build test tags push release
 
@@ -77,11 +84,11 @@ endif
 
 release: push
 	docker manifest create $(IMAGE):$(VERSION) $(IMAGE):$(VERSION)-amd64 $(IMAGE):$(VERSION)-arm64
+	docker manifest push $(IMAGE):$(VERSION)
 ifdef MAJOR_VERSION
 	docker manifest create $(IMAGE):$(MAJOR_VERSION) $(IMAGE):$(MAJOR_VERSION)-amd64 $(IMAGE):$(MAJOR_VERSION)-arm64
 	docker manifest create $(IMAGE):latest $(IMAGE):latest-amd64 $(IMAGE):latest-arm64
 	docker manifest push $(IMAGE):$(MAJOR_VERSION)
-endif
-	docker manifest push $(IMAGE):$(VERSION)
 	docker manifest push $(IMAGE):latest
 	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
+endif