diff --git a/docker-compose.yml b/docker-compose.yml index 49ee20d3..fcfd55ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,6 +62,8 @@ services: ports: - "${WORKSPACE_SSH_PORT}:22" tty: true + environment: + - PHP_IDE_CONFIG=${PHP_IDE_CONFIG} networks: - frontend - backend diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 1c6680c9..86083232 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -54,9 +54,8 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock && \ - usermod -p "*" laradock && \ - apt-get update -yqq + useradd -u ${PUID} -g laradock -m laradock -G docker_env && \ + usermod -p "*" laradock ##################################### # SOAP: diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 212979fe..2d9e9e0b 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -54,9 +54,8 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock && \ - usermod -p "*" laradock && \ - apt-get update -yqq + useradd -u ${PUID} -g laradock -m laradock -G docker_env && \ + usermod -p "*" laradock ##################################### # SOAP: diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 8e253eb6..ddc81eb7 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -54,7 +54,7 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock && \ + useradd -u ${PUID} -g laradock -m laradock -G docker_env usermod -p "*" laradock ##################################### diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 727dc88c..473377ff 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -54,10 +54,9 @@ ENV PUID ${PUID} ENV PGID ${PGID} RUN groupadd -g ${PGID} laradock && \ - useradd -u ${PUID} -g laradock -m laradock && \ + useradd -u ${PUID} -g laradock -m laradock -G docker_env usermod -p "*" laradock - ##################################### # SOAP: #####################################