From 245515b41d5ff4437c0d06cc5170b65c6817c5b0 Mon Sep 17 00:00:00 2001 From: Andrew Baranov Date: Thu, 22 Mar 2018 12:38:42 +0300 Subject: [PATCH] Use xDebug with Laravel scheduler inside workspace container. --- docker-compose.yml | 2 ++ workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- workspace/Dockerfile-72 | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 13175283..923a330d 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 52d2a001..d021f8e2 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -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 && \ apt-get update -yqq ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 384dbbde..b198ddfc 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -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 && \ apt-get update -yqq ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b5521c7f..514d5b62 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 ##################################### # SOAP: diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 3a042ee8..3597a1f7 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -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 ##################################### # SOAP: