docker/build-test: fix user setup for new base image

usnistgov · Dec 16, 2024 · f4c7ae9 · f4c7ae9
1 parent 3d13754
commit f4c7ae9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docker/build-test/Dockerfile b/docker/build-test/Dockerfile
@@ -24,11 +24,11 @@ RUN java_certs=$JAVA_HOME/lib/security/cacerts; \
 # launching the container.
 #
 RUN sed --in-place -e '/CREATE_MAIL_SPOOL/ s/=yes/=no/' /etc/default/useradd
-ARG devuser=developer
+ARG devuser=ubuntu
 ARG devuid=1000
 RUN grep -qs :${devuid}: /etc/group || \
     groupadd --gid $devuid $devuser
-RUN grep -qs ":${devuid}:[[:digit:]]+:" /etc/passwd || \
+RUN grep -qsE ":${devuid}:[[:digit:]]+:" /etc/passwd ||    \
     useradd -m --comment "OAR Developer" --shell /bin/bash \
             --gid $devuid --uid $devuid $devuser
 RUN mkdir /home/$devuser/.m2
@@ -37,7 +37,7 @@ VOLUME /app/dev
 VOLUME /app/dist
 COPY settings.xml /app/mvn-user-settings.xml
 COPY settings.xml /home/$devuser/.m2/settings.xml
-RUN chown $devuser:$devuser /home/$devuser/.m2/settings.xml && \
+RUN chown $devuser:$devuid /home/$devuser/.m2/settings.xml && \
     chmod a+r /home/$devuser/.m2/settings.xml
 COPY entrypoint.sh /app/entrypoint.sh
 RUN chmod a+rx /app/entrypoint.sh