Try targetplatform

ixc · Jun 24, 2024 · fe66941 · fe66941
1 parent 8db2747
commit fe66941
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,15 +25,15 @@ jobs:
           no-cache: ${{ github.event_name == 'schedule' }}
           push: true
           tags: ${{ env.IMAGE_REPO }}:sha-${{ env.IMAGE_TAG }}
-      - name: Push branch tag
+      - name: Tag and push image
         run: |
-          docker tag ${{ env.IMAGE_REPO }}:sha-${{ env.IMAGE_TAG }} ${{ env.IMAGE_REPO }}:${GITHUB_REF#refs/heads/}
-          docker push ${{ env.IMAGE_REPO }}:${GITHUB_REF#refs/heads/}
-      - name: Push 'latest' tag
-        if: github.ref == 'refs/heads/master'
-        run: |
-          docker tag ${{ env.IMAGE_REPO }}:sha-${{ env.IMAGE_TAG }} ${{ env.IMAGE_REPO }}:latest
-          docker push ${{ env.IMAGE_REPO }}:latest
+          docker tag ${{ env.IMAGE_REPO }}:${{ env.IMAGE_TAG }} ${{ env.IMAGE_REPO }}:${GITHUB_REF#refs/heads/}
+          time docker push ${{ env.IMAGE_REPO }}:${{ env.IMAGE_TAG }}
+          time docker push ${{ env.IMAGE_REPO }}:${GITHUB_REF#refs/heads/}
+          if [[ "$BRANCH" == master ]]; then
+            docker tag ${{ env.IMAGE_REPO }}:${{ env.IMAGE_TAG }} ${{ env.IMAGE_REPO }}:latest
+            time docker push ${{ env.IMAGE_REPO }}:latest
+          fi
 
     strategy:
       matrix:

diff --git a/Dockerfile b/Dockerfile
@@ -12,13 +12,12 @@ RUN apk update \
 
 ENV DOCKERIZE_VERSION=0.5.0
 
-RUN apkArch="$(apk --print-arch)"; \
-case "$apkArch" in \
-    armhf) export DOCKERIZE_ARCH='armhf' ;; \
-    x86) export DOCKERIZE_ARCH='amd64' ;; \
-esac;
-
-RUN wget -nv -O - "https://github.com/jwilder/dockerize/releases/download/v${DOCKERIZE_VERSION}/dockerize-linux-${DOCKERIZE_ARCH}-v${DOCKERIZE_VERSION}.tar.gz" | tar -xz -C /usr/local/bin/ -f -
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then DOCKERIZE_ARCH=amd64; elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then DOCKERIZE_ARCH=armhf; else DOCKERIZE_ARCH=amd64; fi \
+    && echo "TARGETPLATFORM=${TARGETPLATFORM}" \
+    && echo "DOCKERIZE_ARCH=${DOCKERIZE_ARCH}" \
+    && echo "DOCKERIZE_VERSION=${DOCKERIZE_VERSION}" \
+    && wget -nv -O - "https://github.com/jwilder/dockerize/releases/download/v${DOCKERIZE_VERSION}/dockerize-linux-${DOCKERIZE_ARCH}-v${DOCKERIZE_VERSION}.tar.gz" | tar -xz -C /usr/local/bin/ -f -
 
 ENV PATH="$PATH:/opt/restic-pg-dump/bin"