From 13b5fdf98a0ac5e7a6e439c56480b48afbea95ac Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 7 Sep 2022 14:29:17 +0900 Subject: [PATCH 1/2] make a sym link of rstudio-server executable --- scripts/install_rstudio.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install_rstudio.sh b/scripts/install_rstudio.sh index 18f02092..d358f621 100755 --- a/scripts/install_rstudio.sh +++ b/scripts/install_rstudio.sh @@ -67,6 +67,8 @@ fi dpkg -i "$DOWNLOAD_FILE" rm "$DOWNLOAD_FILE" +ln -fs /usr/lib/rstudio-server/bin/rstudio-server /usr/local/bin + # https://github.com/rocker-org/rocker-versioned2/issues/137 rm -f /var/lib/rstudio-server/secure-cookie-key @@ -129,6 +131,6 @@ rm -rf /var/lib/apt/lists/* # Check the RStudio Server version echo -e "Check the RStudio Server version...\n" -/usr/lib/rstudio-server/bin/rstudio-server version +rstudio-server version echo -e "\nInstall RStudio Server, done!" From 718d2dd6b35ef63d8f1c6be5a91665e87fed9641 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 7 Sep 2022 06:09:04 +0000 Subject: [PATCH 2/2] remove unnecessary PATH updates --- dockerfiles/ml-cuda11_4.0.3.Dockerfile | 1 - dockerfiles/ml-cuda11_4.0.4.Dockerfile | 1 - dockerfiles/ml-cuda11_4.0.5.Dockerfile | 1 - dockerfiles/ml-cuda11_4.1.0.Dockerfile | 1 - dockerfiles/ml-cuda11_4.1.1.Dockerfile | 1 - dockerfiles/ml-cuda11_4.1.2.Dockerfile | 1 - dockerfiles/ml-cuda11_4.1.3.Dockerfile | 1 - dockerfiles/ml-cuda11_4.2.0.Dockerfile | 1 - dockerfiles/ml-cuda11_4.2.1.Dockerfile | 1 - dockerfiles/ml-cuda11_devel.Dockerfile | 1 - dockerfiles/ml_4.0.0.Dockerfile | 1 - dockerfiles/ml_4.0.1.Dockerfile | 1 - dockerfiles/ml_4.0.2.Dockerfile | 1 - dockerfiles/ml_4.0.3.Dockerfile | 1 - dockerfiles/ml_4.0.4.Dockerfile | 1 - dockerfiles/ml_4.0.5.Dockerfile | 1 - dockerfiles/ml_4.1.0.Dockerfile | 1 - dockerfiles/ml_4.1.1.Dockerfile | 1 - dockerfiles/ml_4.1.2.Dockerfile | 1 - dockerfiles/ml_4.1.3.Dockerfile | 1 - dockerfiles/ml_4.2.0.Dockerfile | 1 - dockerfiles/ml_4.2.1.Dockerfile | 1 - dockerfiles/ml_devel.Dockerfile | 1 - dockerfiles/rstudio_4.0.0.Dockerfile | 1 - dockerfiles/rstudio_4.0.1.Dockerfile | 1 - dockerfiles/rstudio_4.0.2.Dockerfile | 1 - dockerfiles/rstudio_4.0.3.Dockerfile | 1 - dockerfiles/rstudio_4.0.4.Dockerfile | 1 - dockerfiles/rstudio_4.0.5.Dockerfile | 1 - dockerfiles/rstudio_4.1.0.Dockerfile | 1 - dockerfiles/rstudio_4.1.1.Dockerfile | 1 - dockerfiles/rstudio_4.1.2.Dockerfile | 1 - dockerfiles/rstudio_4.1.3.Dockerfile | 1 - dockerfiles/rstudio_4.2.0.Dockerfile | 1 - dockerfiles/rstudio_4.2.1.Dockerfile | 1 - dockerfiles/rstudio_devel.Dockerfile | 1 - dockerfiles/rstudio_latest-daily.Dockerfile | 1 - stacks/4.0.0.json | 8 ++------ stacks/4.0.1.json | 8 ++------ stacks/4.0.2.json | 8 ++------ stacks/4.0.3.json | 11 +++-------- stacks/4.0.4.json | 11 +++-------- stacks/4.0.5.json | 9 +++------ stacks/4.1.0.json | 9 +++------ stacks/4.1.1.json | 9 +++------ stacks/4.1.2.json | 9 +++------ stacks/4.1.3.json | 9 +++------ stacks/4.2.0.json | 9 +++------ stacks/4.2.1.json | 9 +++------ stacks/core-latest-daily.json | 3 +-- stacks/devel.json | 9 +++------ 51 files changed, 37 insertions(+), 121 deletions(-) diff --git a/dockerfiles/ml-cuda11_4.0.3.Dockerfile b/dockerfiles/ml-cuda11_4.0.3.Dockerfile index b4647c89..1c37a35e 100644 --- a/dockerfiles/ml-cuda11_4.0.3.Dockerfile +++ b/dockerfiles/ml-cuda11_4.0.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.0.4.Dockerfile b/dockerfiles/ml-cuda11_4.0.4.Dockerfile index 3971a870..5d726816 100644 --- a/dockerfiles/ml-cuda11_4.0.4.Dockerfile +++ b/dockerfiles/ml-cuda11_4.0.4.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.0.5.Dockerfile b/dockerfiles/ml-cuda11_4.0.5.Dockerfile index 46d55b71..b0891425 100644 --- a/dockerfiles/ml-cuda11_4.0.5.Dockerfile +++ b/dockerfiles/ml-cuda11_4.0.5.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.1.0.Dockerfile b/dockerfiles/ml-cuda11_4.1.0.Dockerfile index abca6b31..59aa162a 100644 --- a/dockerfiles/ml-cuda11_4.1.0.Dockerfile +++ b/dockerfiles/ml-cuda11_4.1.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1717 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.1.1.Dockerfile b/dockerfiles/ml-cuda11_4.1.1.Dockerfile index 130d12eb..155d1a2c 100644 --- a/dockerfiles/ml-cuda11_4.1.1.Dockerfile +++ b/dockerfiles/ml-cuda11_4.1.1.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2021.09.0+351 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.1.2.Dockerfile b/dockerfiles/ml-cuda11_4.1.2.Dockerfile index 8b3f9a54..86bc3606 100644 --- a/dockerfiles/ml-cuda11_4.1.2.Dockerfile +++ b/dockerfiles/ml-cuda11_4.1.2.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.0+443 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.1.3.Dockerfile b/dockerfiles/ml-cuda11_4.1.3.Dockerfile index 08cdeef5..070c5be5 100644 --- a/dockerfiles/ml-cuda11_4.1.3.Dockerfile +++ b/dockerfiles/ml-cuda11_4.1.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.2+485 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.2.0.Dockerfile b/dockerfiles/ml-cuda11_4.2.0.Dockerfile index 5a40fd9b..3c417f99 100644 --- a/dockerfiles/ml-cuda11_4.2.0.Dockerfile +++ b/dockerfiles/ml-cuda11_4.2.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.3+492 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_4.2.1.Dockerfile b/dockerfiles/ml-cuda11_4.2.1.Dockerfile index eb6f6c14..5e02721b 100644 --- a/dockerfiles/ml-cuda11_4.2.1.Dockerfile +++ b/dockerfiles/ml-cuda11_4.2.1.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml-cuda11_devel.Dockerfile b/dockerfiles/ml-cuda11_devel.Dockerfile index 7267651f..d11a7366 100644 --- a/dockerfiles/ml-cuda11_devel.Dockerfile +++ b/dockerfiles/ml-cuda11_devel.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.0.Dockerfile b/dockerfiles/ml_4.0.0.Dockerfile index d41317f7..d3db8e36 100644 --- a/dockerfiles/ml_4.0.0.Dockerfile +++ b/dockerfiles/ml_4.0.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.959 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.1.Dockerfile b/dockerfiles/ml_4.0.1.Dockerfile index 5ceefbb6..1609cfaf 100644 --- a/dockerfiles/ml_4.0.1.Dockerfile +++ b/dockerfiles/ml_4.0.1.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.959 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.2.Dockerfile b/dockerfiles/ml_4.0.2.Dockerfile index 659e12b6..cb350fef 100644 --- a/dockerfiles/ml_4.0.2.Dockerfile +++ b/dockerfiles/ml_4.0.2.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.1093 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.3.Dockerfile b/dockerfiles/ml_4.0.3.Dockerfile index e9690913..bb32ffff 100644 --- a/dockerfiles/ml_4.0.3.Dockerfile +++ b/dockerfiles/ml_4.0.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.4.Dockerfile b/dockerfiles/ml_4.0.4.Dockerfile index 592f4419..811c4398 100644 --- a/dockerfiles/ml_4.0.4.Dockerfile +++ b/dockerfiles/ml_4.0.4.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.0.5.Dockerfile b/dockerfiles/ml_4.0.5.Dockerfile index 002e76af..7144dafd 100644 --- a/dockerfiles/ml_4.0.5.Dockerfile +++ b/dockerfiles/ml_4.0.5.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.1.0.Dockerfile b/dockerfiles/ml_4.1.0.Dockerfile index 21014389..2c0a21c5 100644 --- a/dockerfiles/ml_4.1.0.Dockerfile +++ b/dockerfiles/ml_4.1.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1717 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.1.1.Dockerfile b/dockerfiles/ml_4.1.1.Dockerfile index 11a1c64a..028f5597 100644 --- a/dockerfiles/ml_4.1.1.Dockerfile +++ b/dockerfiles/ml_4.1.1.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2021.09.0+351 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.1.2.Dockerfile b/dockerfiles/ml_4.1.2.Dockerfile index b8440d2f..6a77d102 100644 --- a/dockerfiles/ml_4.1.2.Dockerfile +++ b/dockerfiles/ml_4.1.2.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.0+443 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.1.3.Dockerfile b/dockerfiles/ml_4.1.3.Dockerfile index a0cf3043..4a29e17a 100644 --- a/dockerfiles/ml_4.1.3.Dockerfile +++ b/dockerfiles/ml_4.1.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.2+485 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.2.0.Dockerfile b/dockerfiles/ml_4.2.0.Dockerfile index d95b3445..d38600b5 100644 --- a/dockerfiles/ml_4.2.0.Dockerfile +++ b/dockerfiles/ml_4.2.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.3+492 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_4.2.1.Dockerfile b/dockerfiles/ml_4.2.1.Dockerfile index bf0f8409..77a3ce5e 100644 --- a/dockerfiles/ml_4.2.1.Dockerfile +++ b/dockerfiles/ml_4.2.1.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/ml_devel.Dockerfile b/dockerfiles/ml_devel.Dockerfile index 246ea105..504d4df6 100644 --- a/dockerfiles/ml_devel.Dockerfile +++ b/dockerfiles/ml_devel.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.0.Dockerfile b/dockerfiles/rstudio_4.0.0.Dockerfile index f9fb8d83..3d5ae74b 100644 --- a/dockerfiles/rstudio_4.0.0.Dockerfile +++ b/dockerfiles/rstudio_4.0.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.959 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.1.Dockerfile b/dockerfiles/rstudio_4.0.1.Dockerfile index 9b1e83b7..83285f08 100644 --- a/dockerfiles/rstudio_4.0.1.Dockerfile +++ b/dockerfiles/rstudio_4.0.1.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.959 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.2.Dockerfile b/dockerfiles/rstudio_4.0.2.Dockerfile index 020aa03d..d545cb4b 100644 --- a/dockerfiles/rstudio_4.0.2.Dockerfile +++ b/dockerfiles/rstudio_4.0.2.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.3.1093 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.3.Dockerfile b/dockerfiles/rstudio_4.0.3.Dockerfile index 94cbbb91..9f279d72 100644 --- a/dockerfiles/rstudio_4.0.3.Dockerfile +++ b/dockerfiles/rstudio_4.0.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.4.Dockerfile b/dockerfiles/rstudio_4.0.4.Dockerfile index 94d088d4..2cdcb35d 100644 --- a/dockerfiles/rstudio_4.0.4.Dockerfile +++ b/dockerfiles/rstudio_4.0.4.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.0.5.Dockerfile b/dockerfiles/rstudio_4.0.5.Dockerfile index f2deb789..f2c9a663 100644 --- a/dockerfiles/rstudio_4.0.5.Dockerfile +++ b/dockerfiles/rstudio_4.0.5.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1106 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.1.0.Dockerfile b/dockerfiles/rstudio_4.1.0.Dockerfile index 08265980..91855987 100644 --- a/dockerfiles/rstudio_4.1.0.Dockerfile +++ b/dockerfiles/rstudio_4.1.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=1.4.1717 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.1.1.Dockerfile b/dockerfiles/rstudio_4.1.1.Dockerfile index 7a54a70a..41b4a1c2 100644 --- a/dockerfiles/rstudio_4.1.1.Dockerfile +++ b/dockerfiles/rstudio_4.1.1.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2021.09.0+351 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.1.2.Dockerfile b/dockerfiles/rstudio_4.1.2.Dockerfile index 51d498a9..967f9e32 100644 --- a/dockerfiles/rstudio_4.1.2.Dockerfile +++ b/dockerfiles/rstudio_4.1.2.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.0+443 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.1.3.Dockerfile b/dockerfiles/rstudio_4.1.3.Dockerfile index 8e6bd93e..97baa0dc 100644 --- a/dockerfiles/rstudio_4.1.3.Dockerfile +++ b/dockerfiles/rstudio_4.1.3.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.2+485 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.2.0.Dockerfile b/dockerfiles/rstudio_4.2.0.Dockerfile index 6e6f36e3..c897fb49 100644 --- a/dockerfiles/rstudio_4.2.0.Dockerfile +++ b/dockerfiles/rstudio_4.2.0.Dockerfile @@ -9,7 +9,6 @@ ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.3+492 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_4.2.1.Dockerfile b/dockerfiles/rstudio_4.2.1.Dockerfile index 188d5684..f0ba8356 100644 --- a/dockerfiles/rstudio_4.2.1.Dockerfile +++ b/dockerfiles/rstudio_4.2.1.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_devel.Dockerfile b/dockerfiles/rstudio_devel.Dockerfile index aba6b807..d24a75aa 100644 --- a/dockerfiles/rstudio_devel.Dockerfile +++ b/dockerfiles/rstudio_devel.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=2022.07.1+554 ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/dockerfiles/rstudio_latest-daily.Dockerfile b/dockerfiles/rstudio_latest-daily.Dockerfile index 0a6b0595..50d6c9e7 100644 --- a/dockerfiles/rstudio_latest-daily.Dockerfile +++ b/dockerfiles/rstudio_latest-daily.Dockerfile @@ -10,7 +10,6 @@ ENV RSTUDIO_VERSION=daily ENV DEFAULT_USER=rstudio ENV PANDOC_VERSION=default ENV QUARTO_VERSION=default -ENV PATH=/usr/lib/rstudio-server/bin:$PATH RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh diff --git a/stacks/4.0.0.json b/stacks/4.0.0.json index 53f9638f..0594a309 100644 --- a/stacks/4.0.0.json +++ b/stacks/4.0.0.json @@ -54,8 +54,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.959", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -205,10 +204,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.959", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - - - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.0.1.json b/stacks/4.0.1.json index 71e712c8..b5731dfe 100644 --- a/stacks/4.0.1.json +++ b/stacks/4.0.1.json @@ -45,8 +45,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.959", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -196,10 +195,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.959", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - - - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.0.2.json b/stacks/4.0.2.json index 1ab90800..705bf4ff 100644 --- a/stacks/4.0.2.json +++ b/stacks/4.0.2.json @@ -45,8 +45,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.1093", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -196,10 +195,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.3.1093", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - - - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.0.3.json b/stacks/4.0.3.json index 8ee024d1..74962bb5 100644 --- a/stacks/4.0.3.json +++ b/stacks/4.0.3.json @@ -45,8 +45,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -196,10 +195,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - - - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -274,8 +270,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.0.4.json b/stacks/4.0.4.json index 47b8a659..e276f4d5 100644 --- a/stacks/4.0.4.json +++ b/stacks/4.0.4.json @@ -45,8 +45,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -196,10 +195,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - - - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -274,8 +270,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.0.5.json b/stacks/4.0.5.json index 5eeba956..0c88e12d 100644 --- a/stacks/4.0.5.json +++ b/stacks/4.0.5.json @@ -46,8 +46,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -208,8 +207,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -287,8 +285,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1106", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.1.0.json b/stacks/4.1.0.json index 0012e62b..6eef5064 100644 --- a/stacks/4.1.0.json +++ b/stacks/4.1.0.json @@ -63,8 +63,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1717", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -218,8 +217,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1717", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -303,8 +301,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "1.4.1717", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.1.1.json b/stacks/4.1.1.json index 88517a66..febdb0db 100644 --- a/stacks/4.1.1.json +++ b/stacks/4.1.1.json @@ -63,8 +63,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2021.09.0+351", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -218,8 +217,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2021.09.0+351", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -303,8 +301,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2021.09.0+351", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.1.2.json b/stacks/4.1.2.json index 0cb1bdab..52e88861 100644 --- a/stacks/4.1.2.json +++ b/stacks/4.1.2.json @@ -63,8 +63,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.0+443", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -218,8 +217,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.0+443", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -303,8 +301,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.0+443", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.1.3.json b/stacks/4.1.3.json index 3a8d6684..1879f30e 100644 --- a/stacks/4.1.3.json +++ b/stacks/4.1.3.json @@ -66,8 +66,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.2+485", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -254,8 +253,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.2+485", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -351,8 +349,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.2+485", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.2.0.json b/stacks/4.2.0.json index 071f6820..03e5fcb8 100644 --- a/stacks/4.2.0.json +++ b/stacks/4.2.0.json @@ -64,8 +64,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.3+492", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -230,8 +229,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.3+492", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -319,8 +317,7 @@ "S6_VERSION": "v2.1.0.2", "RSTUDIO_VERSION": "2022.02.3+492", "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "PANDOC_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/4.2.1.json b/stacks/4.2.1.json index 8897bded..e91a5996 100644 --- a/stacks/4.2.1.json +++ b/stacks/4.2.1.json @@ -71,8 +71,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -303,8 +302,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -416,8 +414,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/core-latest-daily.json b/stacks/core-latest-daily.json index d1ac9c75..aba5d1d0 100644 --- a/stacks/core-latest-daily.json +++ b/stacks/core-latest-daily.json @@ -28,8 +28,7 @@ "RSTUDIO_VERSION": "daily", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", diff --git a/stacks/devel.json b/stacks/devel.json index b9a4c778..6a4b988b 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -51,8 +51,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -185,8 +184,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh", @@ -264,8 +262,7 @@ "RSTUDIO_VERSION": "2022.07.1+554", "DEFAULT_USER": "rstudio", "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default", - "PATH": "/usr/lib/rstudio-server/bin:$PATH" + "QUARTO_VERSION": "default" }, "RUN": [ "/rocker_scripts/install_rstudio.sh",