diff --git a/.env b/.env index d1d7826..3d95931 100644 --- a/.env +++ b/.env @@ -21,13 +21,6 @@ INFLUXDB_PORT=8086 INFLUXDB_PASSWORD=2RPJpkrduLgkpfQCpcBe1jYv INFLUXDB_ADMIN_TOKEN=egLfcf7fx0FESqFYU3RpAAbj -######################################################################## -# PHP -######################################################################## -PHP_XDEBUG_MODE=off -PHP_XDEBUG_CLIENT_PORT=5902 -PHP_XDEBUG_CLIENT_HOST=host.docker.internal - ######################################################################## # PHPMyAdmin ######################################################################## diff --git a/docker-compose.yml b/docker-compose.yml index 82e56f7..ab9b515 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,9 +18,6 @@ services: build: context: ./php-fpm args: - PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE} - PHP_XDEBUG_CLIENT_PORT: ${PHP_XDEBUG_CLIENT_PORT} - PHP_XDEBUG_CLIENT_HOST: ${PHP_XDEBUG_CLIENT_HOST} SYMFONY_CLI_VERSION: 4.23.2 MYSQL_PASSWORD: ${MYSQL_PASSWORD} INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 84d9e6c..5b592e7 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -37,20 +37,6 @@ RUN apk add --no-cache \ git \ curl -# Enable php8-xdebug if $PHP_XDEBUG_MODE is not empty -ARG PHP_XDEBUG_MODE=off -ARG PHP_XDEBUG_CLIENT_PORT=5902 -ARG PHP_XDEBUG_CLIENT_HOST=host.docker.internal -COPY xdebug.ini /etc/php8/conf.d/xdebug.ini.template -RUN if [[ "$PHP_XDEBUG_MODE" != "" ]]; then \ - apk add --no-cache php8-pecl-xdebug; \ - export PHP_XDEBUG_MODE=$PHP_XDEBUG_MODE; \ - export PHP_XDEBUG_CLIENT_PORT=$PHP_XDEBUG_CLIENT_PORT; \ - export PHP_XDEBUG_CLIENT_HOST=$PHP_XDEBUG_CLIENT_HOST; \ - envsubst < /etc/php8/conf.d/xdebug.ini.template > /etc/php8/conf.d/xdebug.ini; \ - fi -RUN rm -f /etc/php8/conf.d/xdebug.ini.template - RUN curl -sS https://getcomposer.org/installer | tee composer-setup.php \ && php8 composer-setup.php && rm composer-setup.php* \ && chmod +x composer.phar && mv composer.phar /usr/bin/composer \