Docker: remove borken cruft to switch the user from Dockerfile

diff --git a/tools/docker/Dockerfile.tuto-s4u b/tools/docker/Dockerfile.tuto-s4u
index c95d7fa..687551a 100644 (file)
--- a/tools/docker/Dockerfile.tuto-s4u
+++ b/tools/docker/Dockerfile.tuto-s4u
@@ -3,24 +3,14 @@ FROM simgrid/unstable
 
 RUN apt update && apt -y upgrade
 
-RUN apt install -y sudo && \
-    groupadd -g 999 user && \
-    useradd -r -u 999 -g user user && \
-    echo "user ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
-    chmod 0440 /etc/sudoers.d/user && \
-    mkdir -p /home/user && \
-    chown -R user:user /home/user
-
 # - Clone simgrid-template-s4u, as it is needed by the tutorial
 # - Add an empty makefile advising to run cmake before make, just in case
 RUN apt install -y python-is-python3 pajeng r-base r-cran-tidyverse r-cran-devtools cmake g++ git libboost-dev flex bison libfmt-dev&& \
     cd /source && \
     git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git simgrid-template-s4u.git && \
     printf "master-workers ping-pong:\n\t@echo \"Please run the following command before make:\";echo \"    cmake .\"; exit 1" > Makefile &&\
-    chown -R user:user /source && \
     apt autoremove -y && apt clean && apt autoclean && \
-    chown -R user:user /source
 
 RUN Rscript -e "library(devtools); install_github('schnorr/pajengr');"
 
-CMD ["su", "-", "user", "-c", "/bin/bash"]
+CMD ["/bin/bash"]

diff --git a/tools/docker/Dockerfile.tuto-smpi b/tools/docker/Dockerfile.tuto-smpi
index 1d2aa8f..c20f19c 100644 (file)
--- a/tools/docker/Dockerfile.tuto-smpi
+++ b/tools/docker/Dockerfile.tuto-smpi
@@ -5,21 +5,12 @@ FROM simgrid/stable
 ADD "http://deb.debian.org/debian/dists/testing/Release" skipcache
 RUN apt update && apt -y upgrade
 
-RUN apt install -y sudo && \
-    groupadd -g 999 user && \
-    useradd -r -u 999 -g user user && \
-    echo "user ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
-    chmod 0440 /etc/sudoers.d/user && \
-    mkdir -p /home/user && \
-    chown -R user:user /home/user
-
 # - Clone simgrid-template-smpi, as it is needed by the tutorial
 RUN apt install -y python3 pajeng libssl-dev r-base r-cran-devtools r-cran-tidyverse build-essential g++ gfortran git libboost-dev cmake flex bison libfmt-dev && \
     cd /source && \
     git clone --depth=1 https://framagit.org/simgrid/simgrid-template-smpi.git simgrid-template-smpi.git && \
-    chown -R user:user /source && \
     apt autoremove -y && apt clean && apt autoclean
 
 RUN Rscript -e "library(devtools); install_github('schnorr/pajengr');"
 
-CMD ["su", "-", "user", "-c", "/bin/bash"]
+CMD ["/bin/bash"]