fix image tagging

Author: kenahrens

.github/workflows/docker.yml

@@ -16,48 +16,30 @@ jobs:
     permissions:
       contents: read
       packages: write
-      attestations: write
-      id-token: write
-    strategy:
-      matrix:
-        include:
-          - image: server
-            dockerfile: ./Dockerfile
-            image-name: ${{ github.repository }}
-          - image: client
-            dockerfile: ./Dockerfile.client
-            image-name: ${{ github.repository }}-client
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
+    
     - name: Login to Container Registry
       uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Extract metadata (tags, labels)
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: ${{ env.REGISTRY }}/${{ matrix.image-name }}
-        tags: |
-          type=ref,event=branch
-          type=ref,event=pr
-          type=semver,pattern={{raw}}
-          type=raw,value=latest,enable={{is_default_branch}}
-    - name: Build and push ${{ matrix.image }} image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        file: ${{ matrix.dockerfile }}
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        build-args: |
-          VERSION=${{ github.ref_type == 'tag' && github.ref_name || 'dev' }}
-        attestations: type=provenance,mode=max
-        provenance: false
+    
+    - name: Build and push Docker images
+      run: |
+        if [ "${{ github.event_name }}" == "pull_request" ]; then
+          echo "Building images for PR (no push)"
+          make docker-build
+          make docker-build-client
+        else
+          echo "Building and pushing images"
+          make docker-push
+        fi

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test coverage coverage-html clean proxymock-mock run build build-client integration-test load-test http-test http-test-recording bump-major bump-minor bump-patch version docker-build docker-build-client tag release-patch release-minor release-major update-k8s
+.PHONY: test coverage coverage-html clean proxymock-mock run build build-client integration-test load-test http-test http-test-recording bump-major bump-minor bump-patch version docker-build docker-build-client docker-buildx-setup docker-push tag release-patch release-minor release-major update-k8s
 
 # Define proxymock environment variables
 PROXYMOCK_ENV = http_proxy=socks5h://localhost:4140 \
@@ -127,10 +127,17 @@ update-k8s:
 	@echo "Updated k8s manifests to $(CURRENT_VERSION)"
 
 docker-build:
-	docker build --build-arg VERSION=$(CURRENT_VERSION) -t outerspace-go:$(CURRENT_VERSION) -t outerspace-go:latest .
+	docker build --build-arg VERSION=$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go:$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go:latest .
 
 docker-build-client:
-	docker build --build-arg VERSION=$(CURRENT_VERSION) -f Dockerfile.client -t outerspace-client:$(CURRENT_VERSION) -t outerspace-client:latest .
+	docker build --build-arg VERSION=$(CURRENT_VERSION) -f Dockerfile.client -t ghcr.io/speedscale/outerspace-go-client:$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go-client:latest .
+
+docker-buildx-setup:
+	docker buildx create --name outerspace-builder --use || docker buildx use outerspace-builder
+
+docker-push: docker-buildx-setup
+	docker buildx build --platform linux/amd64,linux/arm64 --build-arg VERSION=$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go:$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go:latest --push .
+	docker buildx build --platform linux/amd64,linux/arm64 --build-arg VERSION=$(CURRENT_VERSION) -f Dockerfile.client -t ghcr.io/speedscale/outerspace-go-client:$(CURRENT_VERSION) -t ghcr.io/speedscale/outerspace-go-client:latest --push .
 
 tag:
 	git tag $(CURRENT_VERSION)