From 6f202edea299323b957f27926acc22a2fbc56122 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 28 Jun 2023 16:41:34 +0200 Subject: [PATCH 1/2] Change Dockerfile MAINTAINER command (deprecated) in favour of LABEL Signed-off-by: Jose Luis Rivero --- jenkins-scripts/docker/lib/docker_generate_dockerfile.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index 02434b758..043b470e6 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -134,7 +134,7 @@ cat > Dockerfile << DELIM_DOCKER # Docker file to run build.sh FROM ${FROM_VALUE} -MAINTAINER Jose Luis Rivero +LABEL maintainer="Jose Luis Rivero " # setup environment ENV LANG C From 273f60dd43fa0d4e82a744e6070e81fdfb7e9791 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 28 Jun 2023 16:43:26 +0200 Subject: [PATCH 2/2] Scape $USER in Dockerfile to avoid bash expansion Keep Dockerfile variables in placce. Should help with the local reproducibility. Signed-off-by: Jose Luis Rivero --- jenkins-scripts/docker/lib/docker_generate_dockerfile.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index 043b470e6..9b8831017 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -456,8 +456,8 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN chown -R \$USER:\$USER /home/\$USER # permit access to USER variable inside docker -ENV USER ${USER} -USER $USER +ENV USER \$USER +USER \$USER # Must use sudo where necessary from this point on DELIM_DOCKER_USER