Use buildx when merging Docker tags (#71)

* Use docker buildx for merging tags * Ensure buildx is available
Kaiede · Dec 31, 2023 · 5dbbafa · 5dbbafa
1 parent 0d58bdd
commit 5dbbafa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -66,6 +66,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@master
+
     - name: Login to DockerHub
       if: github.event_name != 'pull_request'
       uses: docker/login-action@v1

diff --git a/Docker/merge.sh b/Docker/merge.sh
@@ -1,13 +1,12 @@
 #!/usr/bin/env bash
 #
-# Merges the Manifests for 
+# Merges amd64 and arm64 into a single tag
 
 tag=$1
 
-docker manifest $tag
+docker buildx imagetools create \
+    -t $tag \
+    $tag-amd64 \
+    $tag-arm64 \
 
-docker manifest create $tag \
-    --amend $tag-amd64 \
-    --amend $tag-arm64 \
-
-docker manifest push $tag
+docker push $tag