Use buildx imagetools create

crazy-max · Aug 17, 2023 · 5eefa44 · 5eefa44
1 parent 472d3a5
commit 5eefa44
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,12 @@ on:
 jobs:
   dockerhub-mirror:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        dry-run:
+          - false
+          - true
     services:
       registry:
         image: registry:2
@@ -40,3 +46,4 @@ jobs:
           dockerhub-repo: crazymax/diun
           dest-registry: localhost:5000
           dest-repo: name/app
+          dry-run: ${{ matrix.dry-run }}
diff --git a/action.yml b/action.yml
@@ -40,33 +40,11 @@ runs:
         DOCKER_DEST_REGISTRY=${{ inputs.dest-registry }}
         DOCKER_DEST_REPO=${{ inputs.dest-repo }}
 
-        PUSH_FLAG=""
+        DRYRUN_FLAG="--dry-run"
         if [ "${{ inputs.dry-run }}" = "false" ]; then
-          PUSH_FLAG="--push"
+          DRYRUN_FLAG=""
         fi
 
-        function get_platforms() {
-          local images=${1}
-          platforms=""
-          for image in $images; do
-            _jq() {
-              echo "${image}" | base64 --decode | jq -r "${1}"
-            }
-            os=$(_jq '.os')
-            arch=$(_jq '.architecture')
-            variant=$(_jq '.variant')
-            platform="$os/$arch"
-            if [ -n "$variant" ] && [ "$variant" != "null" ]; then
-              platform="$platform/$variant"
-            fi
-            if [ -n "$platforms" ]; then
-              platforms="$platforms,"
-            fi
-            platforms="$platforms$platform"
-          done
-          echo "$platforms"
-        }
-
         TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${DOCKERHUB_USERNAME}'", "password": "'${DOCKERHUB_PASSWORD}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
         if [ -z "${TOKEN}" -o "${TOKEN}" == "null" ]; then
           echo >&2 "error: cannot retrieve token"
@@ -79,15 +57,13 @@ runs:
             echo "${TAG}" | base64 --decode | jq -r ${1}
           }
           TAG_NAME=$(_jq '.name')
-          TAG_IMAGES=$(echo "$(_jq '.images')" | jq -r '.[] | @base64')
-          TAG_PLATFORMS=$(get_platforms "${TAG_IMAGES}")
-          echo "::group::Copying ${DOCKERHUB_REPO}:${TAG_NAME} to ${DOCKER_DEST_REGISTRY}/${DOCKER_DEST_REPO}"
-          echo "FROM --platform=\${TARGETPLATFORM:-linux/amd64} ${DOCKERHUB_REPO}:${TAG_NAME}" > Dockerfile.tmp
-          docker buildx build \
-            ${PUSH_FLAG} \
-            --platform "${TAG_PLATFORMS}" \
-            --tag "${DOCKER_DEST_REGISTRY}/${DOCKER_DEST_REPO}:${TAG_NAME}" \
-            --file ./Dockerfile.tmp .
+          echo "::group::Copying ${DOCKERHUB_REPO}:${TAG_NAME} to ${DOCKER_DEST_REGISTRY}/${DOCKER_DEST_REPO}:${TAG_NAME}"
+          set -x
+          docker buildx imagetools create ${DRYRUN_FLAG} --tag "${DOCKER_DEST_REGISTRY}/${DOCKER_DEST_REPO}:${TAG_NAME}" "${DOCKERHUB_REPO}:${TAG_NAME}"
+          set +x
+          if [ "${{ inputs.dry-run }}" = "false" ]; then
+            docker buildx imagetools inspect "${DOCKER_DEST_REGISTRY}/${DOCKER_DEST_REPO}:${TAG_NAME}"
+          fi
           echo "::endgroup"
         done
       shell: bash