Merge pull request #48 from thin-edge/fix-publish-multi-arch

fix: publish multi arch image (again)

.github/workflows/publish.yaml

@@ -23,6 +23,8 @@ jobs:
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          install: true
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -34,4 +36,4 @@ jobs:
       - uses: taiki-e/install-action@just
 
       - name: Publish images
-        run: just build registry ${{ inputs.VERSION || github.ref_name }}
+        run: just publish registry ${{ inputs.VERSION || github.ref_name }}

justfile

@@ -30,15 +30,37 @@ build-setup:
     docker buildx install
     docker run --privileged --rm tonistiigi/binfmt --install all
 
-
-# Build the docker images
+# Build docker images (for testing)
+build OUTPUT_TYPE=DEFAULT_OUTPUT_TYPE VERSION='latest': build-setup
+    docker buildx build \
+        --label "org.opencontainers.image.version={{VERSION}}" \
+        --build-arg "TEDGE_IMAGE={{TEDGE_IMAGE}}" \
+        --build-arg "TEDGE_TAG={{TEDGE_TAG}}" \
+        -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:{{VERSION}}" \
+        -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:latest" \
+        -f Dockerfile \
+        --output=type="{{OUTPUT_TYPE}}",oci-mediatypes=false \
+        --provenance=false \
+        .
+
+# Publish docker images (multi-arch)
 # Example:
-#    just build registry latest
-#    just build registry 1.2.0
+#    just publish registry latest
+#    just publish registry 1.2.0
 # Use oci-mediatypes=false to improve compatibility with older docker versions, e.g. <= 19.0.x
 # See https://github.com/docker/buildx/issues/1964#issuecomment-1644634461
-build OUTPUT_TYPE=DEFAULT_OUTPUT_TYPE VERSION='latest': build-setup
-    docker buildx build --build-arg "TEDGE_IMAGE={{TEDGE_IMAGE}}" --build-arg "TEDGE_TAG={{TEDGE_TAG}}" -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:{{VERSION}}" -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:latest" -f Dockerfile --output=type="{{OUTPUT_TYPE}}",oci-mediatypes=false --provenance=false .
+publish OUTPUT_TYPE=DEFAULT_OUTPUT_TYPE VERSION='latest': build-setup
+    docker buildx build \
+        --platform linux/arm/v6,linux/arm/v7,linux/amd64,linux/arm64 \
+        --label "org.opencontainers.image.version={{VERSION}}" \
+        --build-arg "TEDGE_IMAGE={{TEDGE_IMAGE}}" \
+        --build-arg "TEDGE_TAG={{TEDGE_TAG}}" \
+        -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:{{VERSION}}" \
+        -t "{{REGISTRY}}/{{REPO_OWNER}}/{{IMAGE}}:latest" \
+        -f Dockerfile \
+        --output=type="{{OUTPUT_TYPE}}",oci-mediatypes=false \
+        --provenance=false \
+        .
 
 # Install python virtual environment
 venv: