From 22960eb7c138a8919ea53b7b90fdd144f862341b Mon Sep 17 00:00:00 2001 From: pat-s Date: Mon, 30 Dec 2024 11:24:19 +0100 Subject: [PATCH] fix s3 download locations --- docker/Containerfile-alpine-320 | 2 +- docker/Containerfile-alpine-321 | 2 +- docker/Containerfile-redhat-8 | 2 +- docker/Containerfile-redhat-9 | 2 +- docker/Containerfile-ubuntu-2204 | 2 +- docker/Containerfile-ubuntu-2404 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Containerfile-alpine-320 b/docker/Containerfile-alpine-320 index f8abae9..1e6de33 100644 --- a/docker/Containerfile-alpine-320 +++ b/docker/Containerfile-alpine-320 @@ -57,7 +57,7 @@ RUN bash -c 'echo -e "options(crayon.enabled = TRUE, Ncpus = ${NCPUS}, future.gl RUN bash -c 'echo -e "PKG_SYSREQS=TRUE\nPKG_SYSREQS_VERBOSE=TRUE" > ~/.Renviron' ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/alpine320/r-${R_VERSION}_1_$(arch).apk" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/alpine320/r-${R_VERSION}_1_$(arch).apk" RUN apk add --allow-untrusted "r-${R_VERSION}_1_$(arch).apk" && rm "r-${R_VERSION}_1_$(arch).apk" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Containerfile-alpine-321 b/docker/Containerfile-alpine-321 index 2e6f702..4333650 100644 --- a/docker/Containerfile-alpine-321 +++ b/docker/Containerfile-alpine-321 @@ -57,7 +57,7 @@ RUN bash -c 'echo -e "options(crayon.enabled = TRUE, Ncpus = ${NCPUS}, future.gl RUN bash -c 'echo -e "PKG_SYSREQS=TRUE\nPKG_SYSREQS_VERBOSE=TRUE" > ~/.Renviron' ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/alpine321/r-${R_VERSION}_1_$(arch).apk" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/alpine321/r-${R_VERSION}_1_$(arch).apk" RUN apk add --allow-untrusted "r-${R_VERSION}_1_$(arch).apk" && rm "r-${R_VERSION}_1_$(arch).apk" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Containerfile-redhat-8 b/docker/Containerfile-redhat-8 index a6fd603..56920f0 100644 --- a/docker/Containerfile-redhat-8 +++ b/docker/Containerfile-redhat-8 @@ -43,7 +43,7 @@ RUN cd /JAGS-4.3.2 && make 2>&1 && make install 2>&1 >/dev/null && rm -rf JAGS-4 RUN dnf install -y chromium ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/el8/R-${R_VERSION}-1-1.$(arch).rpm" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/el8/R-${R_VERSION}-1-1.$(arch).rpm" RUN dnf install -q -y "R-${R_VERSION}-1-1.$(arch).rpm" && rm "R-${R_VERSION}-1-1.$(arch).rpm" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Containerfile-redhat-9 b/docker/Containerfile-redhat-9 index 985c6a3..54faa59 100644 --- a/docker/Containerfile-redhat-9 +++ b/docker/Containerfile-redhat-9 @@ -43,7 +43,7 @@ RUN cd /JAGS-4.3.2 && make 2>&1 && make install 2>&1 >/dev/null && rm -rf JAGS-4 RUN dnf install -y chromium ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/el9/R-${R_VERSION}-1-1.$(arch).rpm" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/el9/R-${R_VERSION}-1-1.$(arch).rpm" RUN dnf install -q -y "R-${R_VERSION}-1-1.$(arch).rpm" && rm "R-${R_VERSION}-1-1.$(arch).rpm" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Containerfile-ubuntu-2204 b/docker/Containerfile-ubuntu-2204 index 72248b9..ee854c6 100644 --- a/docker/Containerfile-ubuntu-2204 +++ b/docker/Containerfile-ubuntu-2204 @@ -37,7 +37,7 @@ RUN apt-get install -y software-properties-common && \ apt install -y chromium ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/2204/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/2204/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" RUN gdebi -n -qq "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && rm "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))' diff --git a/docker/Containerfile-ubuntu-2404 b/docker/Containerfile-ubuntu-2404 index 2910043..9a72c69 100644 --- a/docker/Containerfile-ubuntu-2404 +++ b/docker/Containerfile-ubuntu-2404 @@ -37,7 +37,7 @@ RUN apt-get install -y software-properties-common && \ apt install -y chromium ### INSTALL R -RUN curl -O "https://devxy-r-builds.s3.fsn1.backblazeb2.com/2404/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" +RUN curl -O "https://devxy-r-builds.fsn1.your-objectstorage.com/2404/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" RUN gdebi -n -qq "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && rm "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/devel/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'