From e3a6b1d37574849c2ee98d9e9edf4d70fd17b466 Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 03:46:11 +0000
Subject: [PATCH] fix: remove non-root user from the base library/ubuntu image

---
 build/templates/dockerfiles/cuda.Dockerfile.txt        | 9 ++++++++-
 build/templates/dockerfiles/geospatial.Dockerfile.txt  | 9 ++++++++-
 build/templates/dockerfiles/ml-verse.Dockerfile.txt    | 9 ++++++++-
 build/templates/dockerfiles/ml.Dockerfile.txt          | 9 ++++++++-
 build/templates/dockerfiles/r-ver.Dockerfile.txt       | 9 ++++++++-
 build/templates/dockerfiles/rstudio.Dockerfile.txt     | 9 ++++++++-
 build/templates/dockerfiles/shiny-verse.Dockerfile.txt | 9 ++++++++-
 build/templates/dockerfiles/shiny.Dockerfile.txt       | 9 ++++++++-
 build/templates/dockerfiles/tidyverse.Dockerfile.txt   | 9 ++++++++-
 build/templates/dockerfiles/verse.Dockerfile.txt       | 9 ++++++++-
 dockerfiles/cuda_4.4.1.Dockerfile                      | 9 ++++++++-
 dockerfiles/cuda_4.4.2.Dockerfile                      | 9 ++++++++-
 dockerfiles/cuda_devel.Dockerfile                      | 9 ++++++++-
 dockerfiles/geospatial_4.4.1.Dockerfile                | 9 ++++++++-
 dockerfiles/geospatial_4.4.2.Dockerfile                | 9 ++++++++-
 dockerfiles/geospatial_devel.Dockerfile                | 9 ++++++++-
 dockerfiles/ml-verse_4.4.1.Dockerfile                  | 9 ++++++++-
 dockerfiles/ml-verse_4.4.2.Dockerfile                  | 9 ++++++++-
 dockerfiles/ml-verse_devel.Dockerfile                  | 9 ++++++++-
 dockerfiles/ml_4.4.1.Dockerfile                        | 9 ++++++++-
 dockerfiles/ml_4.4.2.Dockerfile                        | 9 ++++++++-
 dockerfiles/ml_devel.Dockerfile                        | 9 ++++++++-
 dockerfiles/r-ver_4.4.1.Dockerfile                     | 9 ++++++++-
 dockerfiles/r-ver_4.4.2.Dockerfile                     | 9 ++++++++-
 dockerfiles/r-ver_devel.Dockerfile                     | 9 ++++++++-
 dockerfiles/rstudio_4.4.1.Dockerfile                   | 9 ++++++++-
 dockerfiles/rstudio_4.4.2.Dockerfile                   | 9 ++++++++-
 dockerfiles/rstudio_devel.Dockerfile                   | 9 ++++++++-
 dockerfiles/shiny-verse_4.4.1.Dockerfile               | 9 ++++++++-
 dockerfiles/shiny-verse_4.4.2.Dockerfile               | 9 ++++++++-
 dockerfiles/shiny-verse_devel.Dockerfile               | 9 ++++++++-
 dockerfiles/shiny_4.4.1.Dockerfile                     | 9 ++++++++-
 dockerfiles/shiny_4.4.2.Dockerfile                     | 9 ++++++++-
 dockerfiles/shiny_devel.Dockerfile                     | 9 ++++++++-
 dockerfiles/tidyverse_4.4.1.Dockerfile                 | 9 ++++++++-
 dockerfiles/tidyverse_4.4.2.Dockerfile                 | 9 ++++++++-
 dockerfiles/tidyverse_devel.Dockerfile                 | 9 ++++++++-
 dockerfiles/verse_4.4.1.Dockerfile                     | 9 ++++++++-
 dockerfiles/verse_4.4.2.Dockerfile                     | 9 ++++++++-
 dockerfiles/verse_devel.Dockerfile                     | 9 ++++++++-
 40 files changed, 320 insertions(+), 40 deletions(-)

diff --git a/build/templates/dockerfiles/cuda.Dockerfile.txt b/build/templates/dockerfiles/cuda.Dockerfile.txt
index 25aca635..c8d2754c 100644
--- a/build/templates/dockerfiles/cuda.Dockerfile.txt
+++ b/build/templates/dockerfiles/cuda.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/geospatial.Dockerfile.txt b/build/templates/dockerfiles/geospatial.Dockerfile.txt
index 4b9cd25a..d7eab341 100644
--- a/build/templates/dockerfiles/geospatial.Dockerfile.txt
+++ b/build/templates/dockerfiles/geospatial.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/ml-verse.Dockerfile.txt b/build/templates/dockerfiles/ml-verse.Dockerfile.txt
index c16ebddb..0c1035b0 100644
--- a/build/templates/dockerfiles/ml-verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/ml-verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/ml.Dockerfile.txt b/build/templates/dockerfiles/ml.Dockerfile.txt
index ad0fd860..6a522a60 100644
--- a/build/templates/dockerfiles/ml.Dockerfile.txt
+++ b/build/templates/dockerfiles/ml.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/r-ver.Dockerfile.txt b/build/templates/dockerfiles/r-ver.Dockerfile.txt
index 420c5dc5..be2d6b77 100644
--- a/build/templates/dockerfiles/r-ver.Dockerfile.txt
+++ b/build/templates/dockerfiles/r-ver.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/build/templates/dockerfiles/rstudio.Dockerfile.txt b/build/templates/dockerfiles/rstudio.Dockerfile.txt
index b4219e37..4bdad787 100644
--- a/build/templates/dockerfiles/rstudio.Dockerfile.txt
+++ b/build/templates/dockerfiles/rstudio.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="{{rstudio_version}}"
diff --git a/build/templates/dockerfiles/shiny-verse.Dockerfile.txt b/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
index db988b36..c8f395a3 100644
--- a/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/shiny-verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/shiny.Dockerfile.txt b/build/templates/dockerfiles/shiny.Dockerfile.txt
index 4bda582f..d814856b 100644
--- a/build/templates/dockerfiles/shiny.Dockerfile.txt
+++ b/build/templates/dockerfiles/shiny.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/build/templates/dockerfiles/tidyverse.Dockerfile.txt b/build/templates/dockerfiles/tidyverse.Dockerfile.txt
index 10e00cc7..c8dc1449 100644
--- a/build/templates/dockerfiles/tidyverse.Dockerfile.txt
+++ b/build/templates/dockerfiles/tidyverse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/build/templates/dockerfiles/verse.Dockerfile.txt b/build/templates/dockerfiles/verse.Dockerfile.txt
index db116c3d..6101264d 100644
--- a/build/templates/dockerfiles/verse.Dockerfile.txt
+++ b/build/templates/dockerfiles/verse.Dockerfile.txt
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:{{ubuntu_series}}
 
 ENV R_VERSION="{{r_version}}"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/cuda_4.4.1.Dockerfile b/dockerfiles/cuda_4.4.1.Dockerfile
index a03eb845..cb4b36df 100644
--- a/dockerfiles/cuda_4.4.1.Dockerfile
+++ b/dockerfiles/cuda_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/cuda_4.4.2.Dockerfile b/dockerfiles/cuda_4.4.2.Dockerfile
index a9128350..7d216375 100644
--- a/dockerfiles/cuda_4.4.2.Dockerfile
+++ b/dockerfiles/cuda_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/cuda_devel.Dockerfile b/dockerfiles/cuda_devel.Dockerfile
index 15358051..8423e03a 100644
--- a/dockerfiles/cuda_devel.Dockerfile
+++ b/dockerfiles/cuda_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/geospatial_4.4.1.Dockerfile b/dockerfiles/geospatial_4.4.1.Dockerfile
index ffefee3c..570b2c9b 100644
--- a/dockerfiles/geospatial_4.4.1.Dockerfile
+++ b/dockerfiles/geospatial_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/geospatial_4.4.2.Dockerfile b/dockerfiles/geospatial_4.4.2.Dockerfile
index bd1c2b4f..80f295a7 100644
--- a/dockerfiles/geospatial_4.4.2.Dockerfile
+++ b/dockerfiles/geospatial_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/geospatial_devel.Dockerfile b/dockerfiles/geospatial_devel.Dockerfile
index 05f15c90..b507ae14 100644
--- a/dockerfiles/geospatial_devel.Dockerfile
+++ b/dockerfiles/geospatial_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/ml-verse_4.4.1.Dockerfile b/dockerfiles/ml-verse_4.4.1.Dockerfile
index 87573f1d..a25d52e5 100644
--- a/dockerfiles/ml-verse_4.4.1.Dockerfile
+++ b/dockerfiles/ml-verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml-verse_4.4.2.Dockerfile b/dockerfiles/ml-verse_4.4.2.Dockerfile
index 78ad24a7..c6e43643 100644
--- a/dockerfiles/ml-verse_4.4.2.Dockerfile
+++ b/dockerfiles/ml-verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml-verse_devel.Dockerfile b/dockerfiles/ml-verse_devel.Dockerfile
index 42072db9..5b4e65cf 100644
--- a/dockerfiles/ml-verse_devel.Dockerfile
+++ b/dockerfiles/ml-verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_4.4.1.Dockerfile b/dockerfiles/ml_4.4.1.Dockerfile
index 7da805ef..e91b543b 100644
--- a/dockerfiles/ml_4.4.1.Dockerfile
+++ b/dockerfiles/ml_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_4.4.2.Dockerfile b/dockerfiles/ml_4.4.2.Dockerfile
index 2607344f..baf97c04 100644
--- a/dockerfiles/ml_4.4.2.Dockerfile
+++ b/dockerfiles/ml_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/ml_devel.Dockerfile b/dockerfiles/ml_devel.Dockerfile
index 383b4f03..1bf37cb3 100644
--- a/dockerfiles/ml_devel.Dockerfile
+++ b/dockerfiles/ml_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_4.4.1.Dockerfile b/dockerfiles/r-ver_4.4.1.Dockerfile
index ba5b3891..06aaa96c 100644
--- a/dockerfiles/r-ver_4.4.1.Dockerfile
+++ b/dockerfiles/r-ver_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_4.4.2.Dockerfile b/dockerfiles/r-ver_4.4.2.Dockerfile
index aa31c9a2..af010806 100644
--- a/dockerfiles/r-ver_4.4.2.Dockerfile
+++ b/dockerfiles/r-ver_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/r-ver_devel.Dockerfile b/dockerfiles/r-ver_devel.Dockerfile
index 35081cf4..6f037b18 100644
--- a/dockerfiles/r-ver_devel.Dockerfile
+++ b/dockerfiles/r-ver_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 CMD ["R"]
 
diff --git a/dockerfiles/rstudio_4.4.1.Dockerfile b/dockerfiles/rstudio_4.4.1.Dockerfile
index c3bb6590..b5163b37 100644
--- a/dockerfiles/rstudio_4.4.1.Dockerfile
+++ b/dockerfiles/rstudio_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/rstudio_4.4.2.Dockerfile b/dockerfiles/rstudio_4.4.2.Dockerfile
index 72b1d58e..85dd6455 100644
--- a/dockerfiles/rstudio_4.4.2.Dockerfile
+++ b/dockerfiles/rstudio_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/rstudio_devel.Dockerfile b/dockerfiles/rstudio_devel.Dockerfile
index 3c221057..ee5cc64d 100644
--- a/dockerfiles/rstudio_devel.Dockerfile
+++ b/dockerfiles/rstudio_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV RSTUDIO_VERSION="2024.09.1+394"
diff --git a/dockerfiles/shiny-verse_4.4.1.Dockerfile b/dockerfiles/shiny-verse_4.4.1.Dockerfile
index c1d6c1b7..ced8116d 100644
--- a/dockerfiles/shiny-verse_4.4.1.Dockerfile
+++ b/dockerfiles/shiny-verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny-verse_4.4.2.Dockerfile b/dockerfiles/shiny-verse_4.4.2.Dockerfile
index 6dcb3e8f..9f416c90 100644
--- a/dockerfiles/shiny-verse_4.4.2.Dockerfile
+++ b/dockerfiles/shiny-verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny-verse_devel.Dockerfile b/dockerfiles/shiny-verse_devel.Dockerfile
index 20fb235c..7ed1cda4 100644
--- a/dockerfiles/shiny-verse_devel.Dockerfile
+++ b/dockerfiles/shiny-verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/shiny_4.4.1.Dockerfile b/dockerfiles/shiny_4.4.1.Dockerfile
index 90a5b58e..023c52a8 100644
--- a/dockerfiles/shiny_4.4.1.Dockerfile
+++ b/dockerfiles/shiny_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/shiny_4.4.2.Dockerfile b/dockerfiles/shiny_4.4.2.Dockerfile
index d73e02d2..c946935f 100644
--- a/dockerfiles/shiny_4.4.2.Dockerfile
+++ b/dockerfiles/shiny_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/shiny_devel.Dockerfile b/dockerfiles/shiny_devel.Dockerfile
index c19d4d89..c6be602b 100644
--- a/dockerfiles/shiny_devel.Dockerfile
+++ b/dockerfiles/shiny_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 ENV S6_VERSION="v2.1.0.2"
 ENV SHINY_SERVER_VERSION="latest"
diff --git a/dockerfiles/tidyverse_4.4.1.Dockerfile b/dockerfiles/tidyverse_4.4.1.Dockerfile
index 2df806b3..b3336d94 100644
--- a/dockerfiles/tidyverse_4.4.1.Dockerfile
+++ b/dockerfiles/tidyverse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/tidyverse_4.4.2.Dockerfile b/dockerfiles/tidyverse_4.4.2.Dockerfile
index ddc97e3b..48d75f36 100644
--- a/dockerfiles/tidyverse_4.4.2.Dockerfile
+++ b/dockerfiles/tidyverse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/tidyverse_devel.Dockerfile b/dockerfiles/tidyverse_devel.Dockerfile
index 66236277..583e871e 100644
--- a/dockerfiles/tidyverse_devel.Dockerfile
+++ b/dockerfiles/tidyverse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_4.4.1.Dockerfile b/dockerfiles/verse_4.4.1.Dockerfile
index 52b19292..afd971d0 100644
--- a/dockerfiles/verse_4.4.1.Dockerfile
+++ b/dockerfiles/verse_4.4.1.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:jammy
 
 ENV R_VERSION="4.4.1"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_4.4.2.Dockerfile b/dockerfiles/verse_4.4.2.Dockerfile
index 7c21a197..2bca7b9b 100644
--- a/dockerfiles/verse_4.4.2.Dockerfile
+++ b/dockerfiles/verse_4.4.2.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:noble
 
 ENV R_VERSION="4.4.2"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh
diff --git a/dockerfiles/verse_devel.Dockerfile b/dockerfiles/verse_devel.Dockerfile
index 0f7f49a2..9c8e1acf 100644
--- a/dockerfiles/verse_devel.Dockerfile
+++ b/dockerfiles/verse_devel.Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM docker.io/library/ubuntu:latest
 
 ENV R_VERSION="devel"
@@ -12,7 +14,12 @@ ENV LANG=en_US.UTF-8
 
 COPY scripts/bin/ /rocker_scripts/bin/
 COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh
-RUN /rocker_scripts/setup_R.sh
+RUN <<EOF
+if grep -q "1000" /etc/passwd; then
+    userdel --remove $(id -un "1000");
+fi
+/rocker_scripts/setup_R.sh
+EOF
 
 COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh
 RUN /rocker_scripts/install_tidyverse.sh