From d81f48a2b19cac3c797f046650cf6c563804f966 Mon Sep 17 00:00:00 2001 From: egillax Date: Fri, 2 Aug 2024 15:21:09 +0200 Subject: [PATCH] fix platform and add repos to run stage --- .github/workflows/release_docker.yaml | 2 +- Dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_docker.yaml b/.github/workflows/release_docker.yaml index a5dd564..ccb877c 100644 --- a/.github/workflows/release_docker.yaml +++ b/.github/workflows/release_docker.yaml @@ -127,7 +127,7 @@ jobs: # Run package checks docker run --rm \ - --platform "linux-${{ matrix.config.arch }}" \ + --platform "linux/${{ matrix.config.arch }}" \ -e _R_CHECK_FORCE_SUGGESTS_=false \ -e _R_CHECK_CRAN_INCOMING_=false \ -v $(pwd):/workspace -w /workspace \ diff --git a/Dockerfile b/Dockerfile index eb58d43..ff58e65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,10 @@ RUN Rscript -e "ref <- Sys.getenv('GIT_COMMIT_ID_ABBREV', unset = Sys.getenv('GI FROM docker.io/rocker/rstudio:4.4.1 -# + +RUN Rscript -e "if (Sys.getenv('ARCH')=='arm64') {options('repos'=c(RHUB='https://raw.githubusercontent.com/r-hub/repos/main/ubuntu-22.04-aarch64/4.4', \ + CRAN='https://cloud.r-project.org'))} else { \ + options('repos'='https://p3m.dev/cran/__linux__/jammy/latest') COPY --from=build /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages COPY --from=build /database_drivers /database_drivers COPY --from=build /usr/local/lib/R/site-library /usr/local/lib/R/site-library