From e40a76a158ea30a17a40ef4bb31c5e3a30b29dff Mon Sep 17 00:00:00 2001
From: Gapodo <gapodo@datenclown.at>
Date: Mon, 5 Dec 2022 20:39:58 +0100
Subject: [PATCH] retry

---
 .woodpecker/release-version.yml | 52 +++++++++++++++++----------------
 Dockerfile.ci                   |  7 ++---
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.woodpecker/release-version.yml b/.woodpecker/release-version.yml
index cb436f37a9..f073445ce0 100644
--- a/.woodpecker/release-version.yml
+++ b/.woodpecker/release-version.yml
@@ -69,31 +69,6 @@ pipeline:
     secrets:
       - goproxy_override
 
-  build-docker:
-    image: *buildx_plugin_image
-    pull: true
-    environment:
-      defaulttagname: main
-    settings:
-      dockerfile: Dockerfile.ci
-      no_cache: true
-      platforms: *docker_platforms
-      registry:
-        from_secret: domain
-      tag: ${CI_COMMIT_TAG##v}
-      repo: ${CI_REPO_LINK##https://}
-      build_args:
-       - CACHEBUST=${CI_PIPELINE_NUMBER}
-      build_args_from_env:
-       - CI_COMMIT_TAG
-       - DEFAULTTAGNAME
-      password:
-        from_secret: releaseteamtoken
-      username:
-        from_secret: releaseteamuser
-    when:
-      event: tag
-
   gpg-sign:
     image: *gpgsign_plugin_image
     pull: true
@@ -123,3 +98,30 @@ pipeline:
     secrets:
       - releaseteamtoken
       - releaseteamuser
+
+  build-docker:
+    image: *buildx_plugin_image
+    pull: true
+    environment:
+      defaulttagname: main
+    settings:
+      dockerfile: Dockerfile.ci
+      no_cache: true
+      platforms: *docker_platforms
+      registry:
+        from_secret: domain
+      tag: ${CI_COMMIT_TAG##v}
+      repo: ${CI_REPO_LINK##https://}
+      build_args:
+       - CACHEBUST=${CI_PIPELINE_NUMBER}
+      build_args_from_env:
+       - CI_COMMIT_TAG
+       - DEFAULTTAGNAME
+      password:
+        from_secret: releaseteamtoken
+      username:
+        from_secret: releaseteamuser
+    when:
+      event: tag
+
+
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 19b775c583..bed016171d 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,5 +1,5 @@
-FROM alpine:3.17.0 as prep
-
+FROM --platform=$BUILDPLATFORM alpine:3.17.0 as prep
+ARG BUILDPLATFORM
 RUN addgroup \
   -S -g 1000 \
   git && \
@@ -12,8 +12,6 @@ RUN addgroup \
   git && \
   echo "git:*" | chpasswd -e
 
-ARG CACHEBUST=1
-
 RUN apk --no-cache add bash && \
   mkdir -p /docker/bin && \
   mkdir /dist
@@ -27,7 +25,6 @@ ENV DEFAULTTAGNAME=${DEFAULTTAGNAME:-main}
 COPY docker /docker/
 COPY dist /dist/
 
-ARG CACHEBUST=1
 RUN /docker/map-binaries.sh /dist/binaries forgejo ${CI_COMMIT_TAG##v} && \
   /docker/map-binaries.sh /dist/contrib environment-to-ini ${CI_COMMIT_TAG##v}