Commit 61aa1a3f authored by Matthias Jung's avatar Matthias Jung

changes to set env vars if www-data excutes the script with sudo

parent 5a2c413b
......@@ -3,3 +3,4 @@
7.1/shared
7.2/shared
7.3/shared
.project
......@@ -45,7 +45,7 @@ RUN set -ex; \
chmod 777 /tmp
# Allow user www-data to run the xdebug enable script
RUN echo 'www-data ALL=(root) NOPASSWD:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
RUN echo 'www-data ALL=(root) NOPASSWD:SETENV:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
# Add composer package for running composer downloads parallel
RUN composer global require hirak/prestissimo
......
......@@ -51,7 +51,7 @@ RUN set -ex; \
chmod 777 /tmp
# Allow user www-data to run the xdebug enable script
RUN echo 'www-data ALL=(root) NOPASSWD:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
RUN echo 'www-data ALL=(root) NOPASSWD:SETENV:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
# Add composer package for running composer downloads parallel
RUN composer global require hirak/prestissimo
......
......@@ -51,7 +51,7 @@ RUN set -ex; \
chmod 777 /tmp
# Allow user www-data to run the xdebug enable script
RUN echo 'www-data ALL=(root) NOPASSWD:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
RUN echo 'www-data ALL=(root) NOPASSWD:SETENV:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
# Add composer package for running composer downloads parallel
RUN composer global require hirak/prestissimo
......
......@@ -48,7 +48,7 @@ RUN set -ex; \
chmod 777 /tmp
# Allow user www-data to run the xdebug enable script
RUN echo 'www-data ALL=(root) NOPASSWD:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
RUN echo 'www-data ALL=(root) NOPASSWD:SETENV:/usr/local/bin/team23-docker-php-enable-xdebug.sh' >> /etc/sudoers
# Add composer package for running composer downloads parallel
RUN composer global require hirak/prestissimo
......
......@@ -2,6 +2,6 @@
set -e
[ ! -z "${UMASK:-}" ] && umask ${UMASK}
[ "$TEAM23_DOCKER_PHP_ENABLE_XDEBUG" = "1" ] && sudo /usr/local/bin/team23-docker-php-enable-xdebug.sh
[ "$TEAM23_DOCKER_PHP_ENABLE_XDEBUG" = "1" ] && sudo -E /usr/local/bin/team23-docker-php-enable-xdebug.sh
exec docker-php-entrypoint "$@"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment