diff --git a/visualisation-base-r/Dockerfile b/visualisation-base-r/Dockerfile deleted file mode 100644 index ad21d56702..0000000000 --- a/visualisation-base-r/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM debian:buster-slim - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - locales=2.28-10 && \ - echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen && \ - locale-gen en_GB.utf8 && \ - rm -rf /var/lib/apt/lists/* - -ENV \ - LC_ALL=en_GB.UTF-8 \ - LANG=en_GB.UTF-8 \ - LANGUAGE=en_GB.UTF-8 - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - dirmngr \ - gnupg2 && \ - rm -rf /var/lib/apt/lists/* && \ - echo "deb https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/debian/ buster main" > /etc/apt/sources.list && \ - echo "deb http://cran.ma.imperial.ac.uk/bin/linux/debian buster-cran35/" >> /etc/apt/sources.list && \ - echo "Acquire{Check-Valid-Until false; Retries 10;}" >> /etc/apt/apt.conf && \ - until apt-key adv --keyserver keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF'; do sleep 10; done && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - r-base=3.6.1-2~bustercran.0 \ - r-base-dev=3.6.1-2~bustercran.0 \ - r-recommended=3.6.1-2~bustercran.0 && \ - rm -rf /var/lib/apt/lists/* && \ - # Remove the last line from sources: the CRAN debian repo that has R itself, which we don't mirror - sed -i '$d' /etc/apt/sources.list && \ - echo 'local({' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r = getOption("repos")' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r["CRAN"] = "https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/cran-binary/"' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r["CRAN_1"] = "https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/cran/"' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' options(repos = r)' >> /usr/lib/R/etc/Rprofile.site && \ - echo '})' >> /usr/lib/R/etc/Rprofile.site diff --git a/visualisation-base-rv4/Dockerfile b/visualisation-base-rv4/Dockerfile deleted file mode 100644 index 6d2170c436..0000000000 --- a/visualisation-base-rv4/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM debian:bullseye - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - locales \ - ca-certificates \ - dirmngr \ - gnupg2 && \ - echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen && \ - locale-gen en_GB.utf8 && \ - rm -rf /var/lib/apt/lists/* - -ENV \ - LC_ALL=en_GB.UTF-8 \ - LANG=en_GB.UTF-8 \ - LANGUAGE=en_GB.UTF-8 - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - dirmngr \ - gnupg2 && \ - rm -rf /var/lib/apt/lists/* && \ - echo "deb https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/debian/ bullseye main" > /etc/apt/sources.list && \ - echo "Acquire{Check-Valid-Until false; Retries 10;}" >> /etc/apt/apt.conf && \ - until apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'; do sleep 10; done && \ - gpg --armor --export '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' | tee /etc/apt/trusted.gpg.d/cran_debian_key.asc && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get update && \ - apt-get install -y \ - r-base \ - r-recommended && \ - rm -rf /var/lib/apt/lists/* && \ - # Remove the last line from sources: the CRAN debian repo that has R itself, which we don't mirror - sed -i '$d' /etc/apt/sources.list && \ - echo 'local({' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r = getOption("repos")' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r["CRAN"] = "https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/cran-binary-rv4/"' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' r["CRAN_1"] = "https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/cran/"' >> /usr/lib/R/etc/Rprofile.site && \ - echo ' options(repos = r)' >> /usr/lib/R/etc/Rprofile.site && \ - echo '})' >> /usr/lib/R/etc/Rprofile.site diff --git a/visualisation-base/Dockerfile b/visualisation-base/Dockerfile deleted file mode 100644 index 125cb0e7b4..0000000000 --- a/visualisation-base/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:bullseye - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - locales && \ - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ - locale-gen en_US.utf8 && \ - apt-get clean -y && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - rm -rf /tmp/* && \ - rm -rf /var/lib/apt/lists/* - -ENV \ - LC_ALL=en_US.UTF-8 \ - LANG=en_US.UTF-8 \ - LANGUAGE=en_US.UTF-8 - -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - dirmngr \ - gnupg2 && \ - rm -rf /var/lib/apt/lists/* && \ - echo "deb https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/debian/ bullseye main" > /etc/apt/sources.list && \ - echo "deb https://s3-eu-west-2.amazonaws.com/mirrors.notebook.uktrade.io/debian/ bullseye-updates main" >> /etc/apt/sources.list && \ - echo "Acquire{Check-Valid-Until false; Retries 10;}" >> /etc/apt/apt.conf