From d61491428242c780dd4d48d33eef100f9f470d9c Mon Sep 17 00:00:00 2001 From: lcappelli <laura.cappelli@cnaf.infn.it> Date: Fri, 13 May 2022 10:29:28 +0000 Subject: [PATCH] Change user variable name in Dockerfile DEV_USER -> USERNAME DEV_USER_UID -> USER_UID DEV_GID -> USER_GID See the best practise: https://github.com/microsoft/vscode-dev-containers --- .devcontainer/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 460b702..8c1e1a7 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,23 +4,23 @@ FROM centos:7 # Allow customization of build user ID and name -ARG DEV_USER=vscode -ARG DEV_USER_UID=1000 -ARG DEV_GID=${DEV_USER_UID} +ARG USERNAME=vscode +ARG USER_UID=1000 +ARG USER_GID=${USER_UID} -ENV DEV_USER $DEV_USER -ENV DEV_USER_UID $DEV_USER_UID -ENV DEV_GID ${DEV_USER_UID} +ENV USERNAME $USERNAME +ENV USER_UID $USER_UID +ENV USER_GID ${USER_UID} COPY library-script/* /docker/ RUN yum update -y && \ sh /docker/setup.sh && \ - sh /docker/provide-user.sh ${DEV_USER} ${DEV_USER_UID} ${DEV_GID} && \ + sh /docker/provide-user.sh ${USERNAME} ${USER_UID} ${USER_GID} && \ yum clean all && rm -rf /var/cache/yum -COPY --chown=$DEV_USER:$DEV_USER assets/build-install-openresty-voms.sh /home/$DEV_USER/bin/ +COPY --chown=$USERNAME:$USERNAME assets/build-install-openresty-voms.sh /home/$USERNAME/bin/ -USER $DEV_USER +USER $USERNAME RUN sh /docker/build-install-openresty.sh \ No newline at end of file -- GitLab