From ce5ff0d5600319058364f25eeeb49fd67f38f312 Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Thu, 6 Feb 2025 17:52:16 +0200
Subject: [PATCH] WIP: Harmonize CI build with local one

---
 .github/workflows/release-container-image.yml | 8 --------
 install/common/build-image.py                 | 9 ++++++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml
index 5fb2ff9..b6869a7 100644
--- a/.github/workflows/release-container-image.yml
+++ b/.github/workflows/release-container-image.yml
@@ -36,13 +36,6 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
       - name: Login to GHCR
         uses: docker/login-action@v3
         with:
@@ -68,7 +61,6 @@ jobs:
           # reproduced.
           provenance: false
           platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,"name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}",push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
diff --git a/install/common/build-image.py b/install/common/build-image.py
index 87bc4f6..327448f 100644
--- a/install/common/build-image.py
+++ b/install/common/build-image.py
@@ -115,12 +115,19 @@ def main():
 
     # Build the container image, and tag it with the calculated tag
     print("Building container image")
-    buildx_args = ["buildx", "build"] if args.buildx else ["build"]
     cache_args = [] if args.use_cache else ["--no-cache"]
     platform_args = [] if not args.platform else ["--platform", args.platform]
     build_args = []
     if args.debian_archive_date:
         build_args = ["--build-arg", f"DEBIAN_ARCHIVE_DATE={args.debian_archive_date}"]
+    buildx_args = []
+    if args.buildx:
+        buildx_args = [
+            "buildx",
+            "build",
+            "--output",
+            "type=image,name-canonical=true,push=false,push-by-digest=false",
+        ]
 
     subprocess.run(
         [