From db0bb333faf2ca9bbad8df8b4b519f3dbe3453c1 Mon Sep 17 00:00:00 2001 From: "Alexander Demidov (Vostro)" Date: Wed, 14 Jul 2021 18:57:29 +0300 Subject: [PATCH] * reuse ARG in workspace --- docker-compose.base.yml | 6 +++--- dockerfiles/workspace/workspace73.Dockerfile | 18 +++++++++--------- dockerfiles/workspace/workspace74.Dockerfile | 18 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 630efce..841081e 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -37,9 +37,9 @@ services: build: context: ./dockerfiles/workspace args: - - PUID=${WORKSPACE_PUID} - - PGID=${WORKSPACE_PGID} - - TZ=${WORKSPACE_TIMEZONE} + - CUSTOM_PUID=1001 + - CUSTOM_PGID=${WORKSPACE_PGID} + - CUSTOM_TZ=${WORKSPACE_TIMEZONE} restart: always volumes: - ${PROJECTS_DIR}:/var/www diff --git a/dockerfiles/workspace/workspace73.Dockerfile b/dockerfiles/workspace/workspace73.Dockerfile index 12d25d2..b7db028 100644 --- a/dockerfiles/workspace/workspace73.Dockerfile +++ b/dockerfiles/workspace/workspace73.Dockerfile @@ -4,23 +4,23 @@ FROM dimti/workspace:7.3 # Laradock non-root user: ########################################################################### -ARG PUID=1000 -ENV PUID ${PUID} -ARG PGID=1000 -ENV PGID ${PGID} +ARG CUSTOM_PUID=1000 +ENV PUID ${CUSTOM_PUID} +ARG CUSTOM_PGID=1000 +ENV PGID ${CUSTOM_PGID} -RUN usermod -u ${PUID} laradock && groupmod -g ${PGID} laradock +RUN usermod -u ${CUSTOM_PUID} laradock && groupmod -g ${CUSTOM_PGID} laradock -RUN chown -R ${PUID}:${PGID} /home/laradock +RUN chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock ########################################################################### # Set Timezone ########################################################################### -ARG TZ=Europe/Moscow -ENV TZ ${TZ} +ARG CUSTOM_TZ=Europe/Moscow +ENV TZ ${CUSTOM_TZ} -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +RUN ln -snf /usr/share/zoneinfo/$CUSTOM_TZ /etc/localtime && echo $CUSTOM_TZ > /etc/timezone ########################################################################### # Additional PHP-extensions: diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile index fa3e84b..c6df5f7 100644 --- a/dockerfiles/workspace/workspace74.Dockerfile +++ b/dockerfiles/workspace/workspace74.Dockerfile @@ -4,23 +4,23 @@ FROM dimti/workspace:7.4 # Laradock non-root user: ########################################################################### -ARG PUID=1000 -ENV PUID ${PUID} -ARG PGID=1000 -ENV PGID ${PGID} +ARG CUSTOM_PUID=1000 +ENV PUID ${CUSTOM_PUID} +ARG CUSTOM_PGID=1000 +ENV PGID ${CUSTOM_PGID} -RUN usermod -u ${PUID} laradock && groupmod -g ${PGID} laradock +RUN usermod -u ${CUSTOM_PUID} laradock && groupmod -g ${CUSTOM_PGID} laradock -RUN chown -R ${PUID}:${PGID} /home/laradock +RUN chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock ########################################################################### # Set Timezone ########################################################################### -ARG TZ=Europe/Moscow -ENV TZ ${TZ} +ARG CUSTOM_TZ=Europe/Moscow +ENV TZ ${CUSTOM_TZ} -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +RUN ln -snf /usr/share/zoneinfo/$CUSTOM_TZ /etc/localtime && echo $CUSTOM_TZ > /etc/timezone ########################################################################### # Additional PHP-extensions: