fix: this script is needed for run install_rstudio.sh (#797)

#796 lacks this one...
rocker-org · Apr 30, 2024 · 78398b7 · 78398b7
1 parent a8789c4
commit 78398b7
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 0 deletions.
diff --git a/build/templates/dockerfiles/geospatial.Dockerfile.txt b/build/templates/dockerfiles/geospatial.Dockerfile.txt
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/build/templates/dockerfiles/ml-verse.Dockerfile.txt b/build/templates/dockerfiles/ml-verse.Dockerfile.txt
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/build/templates/dockerfiles/ml.Dockerfile.txt b/build/templates/dockerfiles/ml.Dockerfile.txt
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/build/templates/dockerfiles/rstudio.Dockerfile.txt b/build/templates/dockerfiles/rstudio.Dockerfile.txt
@@ -19,6 +19,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/build/templates/dockerfiles/tidyverse.Dockerfile.txt b/build/templates/dockerfiles/tidyverse.Dockerfile.txt
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/build/templates/dockerfiles/verse.Dockerfile.txt b/build/templates/dockerfiles/verse.Dockerfile.txt
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/geospatial_4.3.3.Dockerfile b/dockerfiles/geospatial_4.3.3.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/geospatial_4.4.0.Dockerfile b/dockerfiles/geospatial_4.4.0.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/geospatial_devel.Dockerfile b/dockerfiles/geospatial_devel.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml-verse_4.3.3.Dockerfile b/dockerfiles/ml-verse_4.3.3.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml-verse_4.4.0.Dockerfile b/dockerfiles/ml-verse_4.4.0.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml-verse_devel.Dockerfile b/dockerfiles/ml-verse_devel.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml_4.3.3.Dockerfile b/dockerfiles/ml_4.3.3.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml_4.4.0.Dockerfile b/dockerfiles/ml_4.4.0.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/ml_devel.Dockerfile b/dockerfiles/ml_devel.Dockerfile
@@ -38,6 +38,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/rstudio_4.3.3.Dockerfile b/dockerfiles/rstudio_4.3.3.Dockerfile
@@ -19,6 +19,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/rstudio_4.4.0.Dockerfile b/dockerfiles/rstudio_4.4.0.Dockerfile
@@ -19,6 +19,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/rstudio_devel.Dockerfile b/dockerfiles/rstudio_devel.Dockerfile
@@ -19,6 +19,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/tidyverse_4.3.3.Dockerfile b/dockerfiles/tidyverse_4.3.3.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/tidyverse_4.4.0.Dockerfile b/dockerfiles/tidyverse_4.4.0.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/tidyverse_devel.Dockerfile b/dockerfiles/tidyverse_devel.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/verse_4.3.3.Dockerfile b/dockerfiles/verse_4.3.3.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/verse_4.4.0.Dockerfile b/dockerfiles/verse_4.4.0.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh

diff --git a/dockerfiles/verse_devel.Dockerfile b/dockerfiles/verse_devel.Dockerfile
@@ -22,6 +22,7 @@ ENV DEFAULT_USER="rstudio"
 
 COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh
 COPY scripts/install_s6init.sh /rocker_scripts/install_s6init.sh
+COPY scripts/default_user.sh /rocker_scripts/default_user.sh
 COPY scripts/init_set_env.sh /rocker_scripts/init_set_env.sh
 COPY scripts/init_userconf.sh /rocker_scripts/init_userconf.sh
 COPY scripts/pam-helper.sh /rocker_scripts/pam-helper.sh