Address PR comments

Author: Theofilos Manitaras

ci-scripts/dockerfiles/Lmod_base.dockerfile renamed to ci-scripts/dockerfiles/Lmod-base.dockerfile

@@ -4,9 +4,6 @@ ENV TZ=Europe/Zurich
 ENV DEBIAN_FRONTEND=noninteractive
 ENV _LMOD_VER=8.4.12
 
-# ReFrame user
-RUN useradd -ms /bin/bash rfmuser
-
 # ReFrame requirements
 RUN \
   apt-get -y update && \
@@ -29,5 +26,3 @@ RUN \
   rm -rf /var/lib/apt/lists/*
 
 ENV BASH_ENV=/usr/local/lmod/lmod/init/profile
-
-USER rfmuser

ci-scripts/dockerfiles/Lmod.dockerfile

@@ -5,6 +5,11 @@
 
 FROM reframehpc/rfm-ci-base:lmod
 
+# ReFrame user
+RUN useradd -ms /bin/bash rfmuser
+
+USER rfmuser
+
 # Install ReFrame from the current directory
 COPY --chown=rfmuser . /home/rfmuser/reframe/
 

ci-scripts/dockerfiles/Lmod77_base.dockerfile renamed to ci-scripts/dockerfiles/Lmod77-base.dockerfile

@@ -10,9 +10,6 @@ ENV TZ=Europe/Zurich
 ENV DEBIAN_FRONTEND=noninteractive
 ENV _LMOD_VER=7.7
 
-# ReFrame user
-RUN useradd -ms /bin/bash rfmuser
-
 # ReFrame requirements
 RUN \
   apt-get -y update && \
@@ -35,5 +32,3 @@ RUN \
   rm -rf /var/lib/apt/lists/*
 
 ENV BASH_ENV=/usr/local/lmod/lmod/init/profile
-
-USER rfmuser

ci-scripts/dockerfiles/Lmod77.dockerfile

@@ -5,6 +5,11 @@
 
 FROM reframehpc/rfm-ci-base:lmod77
 
+# ReFrame user
+RUN useradd -ms /bin/bash rfmuser
+
+USER rfmuser
+
 # Install ReFrame from the current directory
 COPY --chown=rfmuser . /home/rfmuser/reframe/
 

ci-scripts/dockerfiles/Tmod32_base.dockerfile renamed to ci-scripts/dockerfiles/Tmod32-base.dockerfile

@@ -1,8 +1,5 @@
 FROM centos:7
 
-# ReFrame user
-RUN useradd -ms /bin/bash rfmuser
-
 # ReFrame requirements
 RUN \
   yum -y install gcc make git python3
@@ -11,5 +8,3 @@ RUN \
 RUN yum -y install environment-modules && \
     yum clean all && \
     rm -rf /var/cache/yum
-
-USER rfmuser

ci-scripts/dockerfiles/Tmod32.dockerfile

@@ -4,6 +4,11 @@
 
 FROM reframehpc/rfm-ci-base:tmod32
 
+# ReFrame user
+RUN useradd -ms /bin/bash rfmuser
+
+USER rfmuser
+
 # Install ReFrame from the current directory
 COPY --chown=rfmuser . /home/rfmuser/reframe/
 

ci-scripts/dockerfiles/Tmod4_base.dockerfile renamed to ci-scripts/dockerfiles/Tmod4-base.dockerfile

@@ -4,9 +4,6 @@ ENV TZ=Europe/Zurich
 ENV DEBIAN_FRONTEND=noninteractive
 ENV _TMOD_VER=4.6.0
 
-# ReFrame user
-RUN useradd -ms /bin/bash rfmuser
-
 # ReFrame requirements
 RUN \
   apt-get -y update && \
@@ -29,5 +26,3 @@ RUN \
   rm -rf /var/lib/apt/lists/*
 
 ENV BASH_ENV=/usr/local/Modules/init/profile.sh
-
-USER rfmuser

ci-scripts/dockerfiles/Tmod4.dockerfile

@@ -4,6 +4,11 @@
 
 FROM reframehpc/rfm-ci-base:tmod4
 
+# ReFrame user
+RUN useradd -ms /bin/bash rfmuser
+
+USER rfmuser
+
 # Install ReFrame from the current directory
 COPY --chown=rfmuser . /home/rfmuser/reframe/