Skip to content

Commit dbdc479

Browse files
committed
changes
1 parent 3aad51d commit dbdc479

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

dhi.alpine.fpm.wsc.Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ RUN pecl download imagick \
104104

105105
# Enable all extensions
106106
RUN echo "" \
107-
&& echo "extension=gd.so" > $PHP_INI_DIR/conf.d/gd.ini \
108-
&& echo "extension=pdo_mysql.so" > $PHP_INI_DIR/conf.d/pdo_mysql.ini \
109-
&& echo "extension=ldap.so" > $PHP_INI_DIR/conf.d/ldap.ini \
110-
&& echo "extension=gmp.so" > $PHP_INI_DIR/conf.d/gmp.ini \
111-
&& echo "extension=exif.so" > $PHP_INI_DIR/conf.d/exif.ini \
112-
&& echo "extension=redis.so" > $PHP_INI_DIR/conf.d/redis.ini \
113-
&& echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/imagick.ini \
107+
&& echo "extension=gd.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-gd.ini \
108+
&& echo "extension=pdo_mysql.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-pdo_mysql.ini \
109+
&& echo "extension=ldap.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-ldap.ini \
110+
&& echo "extension=gmp.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-gmp.ini \
111+
&& echo "extension=exif.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-exif.ini \
112+
&& echo "extension=redis.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-redis.ini \
113+
&& echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-imagick.ini \
114114
&& echo ""
115115

116116
## create symlinks

dhi.debian.fpm.wsc.Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ RUN pecl download imagick \
105105

106106
# Enable all extensions
107107
RUN echo "" \
108-
&& echo "extension=gd.so" > $PHP_INI_DIR/conf.d/gd.ini \
109-
&& echo "extension=pdo_mysql.so" > $PHP_INI_DIR/conf.d/pdo_mysql.ini \
110-
&& echo "extension=ldap.so" > $PHP_INI_DIR/conf.d/ldap.ini \
111-
&& echo "extension=gmp.so" > $PHP_INI_DIR/conf.d/gmp.ini \
112-
&& echo "extension=exif.so" > $PHP_INI_DIR/conf.d/exif.ini \
113-
&& echo "extension=redis.so" > $PHP_INI_DIR/conf.d/redis.ini \
114-
&& echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/imagick.ini \
108+
&& echo "extension=gd.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-gd.ini \
109+
&& echo "extension=pdo_mysql.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-pdo_mysql.ini \
110+
&& echo "extension=ldap.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-ldap.ini \
111+
&& echo "extension=gmp.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-gmp.ini \
112+
&& echo "extension=exif.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-exif.ini \
113+
&& echo "extension=redis.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-redis.ini \
114+
&& echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/10-docker-php-ext-imagick.ini \
115115
&& echo ""
116116

117117
## create symlinks

examples/fpm-nginx-dhi/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
restart: unless-stopped
1111
volumes:
1212
- ./html:/var/www/html:rw
13-
- ./config/php_wsc.ini:/opt/php/etc/php/conf.d/wsc.ini:ro
13+
- ./config/php_wsc.ini:/opt/php/etc/php/conf.d/60-wsc.ini:ro
1414
- ./config/php_fpm_status.conf:/opt/php/etc/php-fpm.d/y-status.conf:ro
1515
#depends_on:
1616
# wsc-db:

0 commit comments

Comments
 (0)