This repository was archived by the owner on Mar 15, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +3
-9
lines changed
Expand file tree Collapse file tree 3 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -11,8 +11,4 @@ source ${ROOT}/.env;
1111/bin/bash ${ROOT} /_bin/utils/_sedi " s/\$ {APACHE_ENABLE_XDEBUG}/${APACHE_ENABLE_XDEBUG} /g" ${ROOT} /docker-compose.yml;
1212/bin/bash ${ROOT} /_bin/utils/_sedi " s/- VIRTUAL_HOST=\$ {APACHE_VIRTUAL_HOST}/- VIRTUAL_HOST=${APACHE_VIRTUAL_HOST} /g" ${ROOT} /docker-compose.yml;
1313/bin/bash ${ROOT} /_bin/utils/_sedi " s/\$ {USER_ID}/$( id -u) /g" ${ROOT} /docker-compose.yml; # permissions issues workaround
14- /bin/bash ${ROOT} /_bin/utils/_sedi " s/\$ {REVERSE_PROXY_NAME}/${REVERSE_PROXY_NAME} /g" ${ROOT} /docker-compose.yml;
15-
16- if [ ${APACHE_ENABLE_XDEBUG} = 0 ]; then
17- /bin/bash ${ROOT} /_bin/utils/_sedi " s/- .\/apache\/ext-xdebug.ini/#- .\/apache\/ext-xdebug.ini/g" ${ROOT} /docker-compose.yml;
18- fi ;
14+ /bin/bash ${ROOT} /_bin/utils/_sedi " s/\$ {REVERSE_PROXY_NAME}/${REVERSE_PROXY_NAME} /g" ${ROOT} /docker-compose.yml;
Original file line number Diff line number Diff line change @@ -35,7 +35,8 @@ RUN if [ ${ENABLE_XDEBUG} = 1 ]; then \
3535 pecl install xdebug \
3636;fi
3737
38- RUN rm -rf /usr/local/etc/php/conf.d
38+ # handles .ini files
39+ RUN rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
3940COPY conf.d /usr/local/etc/php/conf.d
4041
4142# enables cron
Original file line number Diff line number Diff line change @@ -5,9 +5,6 @@ services:
55 ${APACHE_SERVICE_NAME}:
66 volumes:
77 - ./apache/volume:/var/www/html:rw
8- #- ./apache/php.ini:/usr/local/etc/php/php.ini:ro
9- #- ./apache/ext-apcu.ini:/usr/local/etc/php/conf.d/ext-apcu.ini:ro
10- # - ./apache/ext-xdebug.ini:/usr/local/etc/php/conf.d/ext-xdebug.ini:ro
118 restart: unless-stopped
129 build:
1310 context: ./apache
You can’t perform that action at this time.
0 commit comments