From 250f09245b657e29ae339f748b8ff2b3902dc350 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 22 Jan 2021 16:55:27 +0100
Subject: [PATCH] ci: drop experimental --platform argument from docker

---
 build-docker.sh    | 6 +++---
 ci/environment.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-docker.sh b/build-docker.sh
index 3d51a1d5e..e2903c477 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -16,7 +16,7 @@ PRODUCTION=${PRODUCTION:-1}
 MEMORY_PROTECT=${MEMORY_PROTECT:-1}
 
 wget --no-config -nc -P ci/ "$CONTAINER_FS_URL"
-docker build --platform "linux/$ALPINE_ARCH" --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" -t "$CONTAINER_NAME" ci/
+docker build --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" -t "$CONTAINER_NAME" ci/
 
 # stat under macOS has slightly different cli interface
 USER=$(stat -c "%u" . 2>/dev/null || stat -f "%u" .)
@@ -54,7 +54,7 @@ for BITCOIN_ONLY in 0 1; do
     chown -R $USER:$GROUP /build
 EOF
 
-  docker run --platform "linux/$ALPINE_ARCH" -it --rm \
+  docker run -it --rm \
     -v "$DIR:/local" \
     -v "$DIR/build/core$DIRSUFFIX":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
@@ -94,7 +94,7 @@ for BITCOIN_ONLY in 0 1; do
     chown -R $USER:$GROUP /build
 EOF
 
-  docker run --platform "linux/$ALPINE_ARCH" -it --rm \
+  docker run -it --rm \
     -v "$DIR:/local" \
     -v "$DIR/build/legacy$DIRSUFFIX":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
diff --git a/ci/environment.yml b/ci/environment.yml
index 78a19a6a5..76ea20091 100644
--- a/ci/environment.yml
+++ b/ci/environment.yml
@@ -14,6 +14,6 @@ environment:
     - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
   script:
     - wget -nc -P ci/ http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_RELEASE/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_VERSION-$ALPINE_ARCH.tar.gz
-    - docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest --platform "linux/$ALPINE_ARCH" --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg FULLDEPS_TESTING=1 ci/
+    - docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest --build-arg ALPINE_VERSION="$ALPINE_VERSION" --build-arg ALPINE_ARCH="$ALPINE_ARCH" --build-arg FULLDEPS_TESTING=1 ci/
     - docker push $CONTAINER_NAME:$CI_COMMIT_SHA
     - docker push $CONTAINER_NAME:latest