From 76bc8d0a6d015435c2a44d9742c9d3d0c180afb2 Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Sat, 6 Jul 2024 17:10:31 +0200
Subject: [PATCH] set platform

---
 .woodpecker/build.yaml     | 35 +----------------------------------
 builder/docker-compose.yml |  1 +
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 94138e5..6796f9d 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -56,13 +56,12 @@ steps:
     environment:
       DOCKER_HOST: tcp://docker:2375
     commands: |
+      docker --version
       if [ ! -s r_build_latest.txt ] || [ ! "$(cat r-release-version.txt)" = "$(cat r_build_latest.txt)" ]; then
         apk add -q --no-cache py3-pip make just aws-cli docker-compose
         pip3 install -q b2 --break-system-packages
         just build-r-${PLATFORM} $(cat r-release-version.txt)
       fi
-    # volumes:
-    #   - ci-tmp:/tmp
 
   - name: Upload
     image: pats22/s3-plugin:latest
@@ -83,38 +82,6 @@ steps:
     volumes:
       - ci-tmp:/tmp
 
-  # - name: Upload to S3
-  #   image: alpine:3.20
-  #   secrets:
-  #     [
-  #       aws_access_key_id_cynkra,
-  #       aws_secret_access_key_cynkra,
-  #       b2_application_key,
-  #       b2_application_key_id,
-  #     ]
-  #   environment:
-  #     # AWS_ACCESS_KEY_ID:
-  #     #   from_secret: aws_access_key_id_cynkra
-  #     # AWS_SECRET_ACCESS_KEY:
-  #     #   from_secret: aws_secret_access_key_cynkra
-  #     AWS_ACCESS_KEY_ID:
-  #       from_secret: b2_application_key
-  #     AWS_SECRET_ACCESS_KEY:
-  #       from_secret: b2_application_key_id
-  #     AWS_ENDPOINT_URL: s3.eu-central-003.backblazeb2.com
-  #   commands: |
-  #     apk add -q --no-cache bash aws-cli
-  #     if [ "$(ls -A /tmp/${PLATFORM}/)" ]; then
-  #       for file in /tmp/${PLATFORM}/*; do
-  #         aws s3 cp --acl public-read --no-progress "$file" "s3://devxy-r-builds/${PLATFORM_ID}/"
-  #       done
-  #       rm -f /tmp/${PLATFORM}/*
-  #     else
-  #       echo "No files to upload."
-  #     fi
-  #   volumes:
-  #     - /tmp:/tmp
-
 services:
   docker:
     environment:
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
index e39e590..45ab398 100644
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@@ -96,6 +96,7 @@ services:
     volumes:
       - /tmp/centos-8:/tmp/output/centos-8
   rhel-9:
+    platform: linux/arm64/v8
     command: ./build.sh
     environment:
       - R_VERSION=${R_VERSION}