Skip to content

Commit c4a75f6

Browse files
authored
Merge pull request #29 from devilbox/release-0.20
Fix dependencies
2 parents c738979 + d081de8 commit c4a75f6

File tree

6 files changed

+88
-82
lines changed

6 files changed

+88
-82
lines changed

Dockerfiles/mods/Dockerfile-5.6

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ENV BUILD_DEPS \
3030
libvpx-dev \
3131
zlib1g-dev \
3232
libfreetype6-dev \
33+
libwebp-dev \
3334
libgmp-dev \
3435
libmagickwand-dev \
3536
libc-client-dev \
@@ -57,7 +58,6 @@ ENV BUILD_DEPS \
5758
libpq-dev \
5859
libsqlite3-dev \
5960
libpq-dev \
60-
libssl-dev \
6161
libpspell-dev \
6262
libedit-dev \
6363
libreadline-dev \
@@ -83,31 +83,32 @@ ENV BUILD_DEPS \
8383
git
8484

8585
ENV RUN_DEPS \
86-
librabbitmq1 \
86+
librabbitmq4 \
8787
libenchant1c2a \
88-
libpng12-0 \
88+
libpng16-16 \
8989
libjpeg62-turbo \
9090
libxpm4 \
91-
libvpx1 \
91+
libvpx4 \
9292
libfreetype6 \
93-
libmagickwand-6.q16-2 \
93+
libwebp6 \
94+
libmagickwand-6.q16-3 \
9495
libc-client2007e \
9596
libfbclient2 \
96-
libicu52 \
97+
libicu57 \
9798
libmcrypt4 \
9899
libmemcachedutil2 \
99-
libmysqlclient18 \
100+
libmariadbclient18 \
100101
libsybdb5 \
101102
libfbclient2 \
102103
libpq5 \
103104
libpq5 \
104105
libaspell15 \
105106
librecode0 \
106107
snmp \
107-
libnghttp2-5 \
108-
libtidy-0.99-0 \
108+
libnghttp2-14 \
109+
libtidy5 \
109110
libxslt1.1 \
110-
libzip2 \
111+
libzip4 \
111112
ca-certificates
112113

113114

@@ -199,7 +200,6 @@ RUN set -x \
199200
&& cd build && ./install \
200201
&& docker-php-ext-enable phalcon \
201202
&& cd / && rm -rf /tmp/phalcon \
202-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \
203203
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \
204204
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
205205
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \
@@ -351,8 +351,6 @@ RUN set -x \
351351
&& php-fpm -m | grep -oiE '^pgsql$' \
352352
&& php -m | grep -oiE '^phalcon$' \
353353
&& php-fpm -m | grep -oiE '^phalcon$' \
354-
&& php -m | grep -oiE '^phar$' \
355-
&& php-fpm -m | grep -oiE '^phar$' \
356354
&& php -m | grep -oiE '^posix$' \
357355
&& php-fpm -m | grep -oiE '^posix$' \
358356
&& php -m | grep -oiE '^pspell$' \

Dockerfiles/mods/Dockerfile-7.0

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ ENV BUILD_DEPS \
8181
git
8282

8383
ENV RUN_DEPS \
84-
librabbitmq1 \
84+
librabbitmq4 \
8585
libenchant1c2a \
86-
libpng12-0 \
86+
libpng16-16 \
8787
libjpeg62-turbo \
8888
libxpm4 \
89-
libvpx1 \
89+
libvpx4 \
9090
libfreetype6 \
91-
libwebp-dev \
92-
libmagickwand-6.q16-2 \
91+
libwebp6 \
92+
libmagickwand-6.q16-3 \
9393
libc-client2007e \
9494
libfbclient2 \
95-
libicu52 \
95+
libicu57 \
9696
libmcrypt4 \
9797
libmemcachedutil2 \
9898
libsybdb5 \
@@ -102,10 +102,10 @@ ENV RUN_DEPS \
102102
libaspell15 \
103103
librecode0 \
104104
snmp \
105-
libnghttp2-5 \
106-
libtidy-0.99-0 \
105+
libnghttp2-14 \
106+
libtidy5 \
107107
libxslt1.1 \
108-
libzip2 \
108+
libzip4 \
109109
ca-certificates
110110

111111

Dockerfiles/mods/Dockerfile-7.1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ ENV BUILD_DEPS \
8181
git
8282

8383
ENV RUN_DEPS \
84-
librabbitmq1 \
84+
librabbitmq4 \
8585
libenchant1c2a \
86-
libpng12-0 \
86+
libpng16-16 \
8787
libjpeg62-turbo \
8888
libxpm4 \
89-
libvpx1 \
89+
libvpx4 \
9090
libfreetype6 \
91-
libwebp-dev \
92-
libmagickwand-6.q16-2 \
91+
libwebp6 \
92+
libmagickwand-6.q16-3 \
9393
libc-client2007e \
9494
libfbclient2 \
95-
libicu52 \
95+
libicu57 \
9696
libmcrypt4 \
9797
libmemcachedutil2 \
9898
libsybdb5 \
@@ -102,10 +102,10 @@ ENV RUN_DEPS \
102102
libaspell15 \
103103
librecode0 \
104104
snmp \
105-
libnghttp2-5 \
106-
libtidy-0.99-0 \
105+
libnghttp2-14 \
106+
libtidy5 \
107107
libxslt1.1 \
108-
libzip2 \
108+
libzip4 \
109109
ca-certificates
110110

111111

Dockerfiles/mods/Dockerfile-7.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ RUN set -x \
129129
&& rm -rf ioncube \
130130
&& rm -rf ioncube.tar.gz \
131131
\
132-
&& pecl install amqp \
132+
&& echo "/usr" | pecl install amqp \
133133
&& docker-php-ext-enable amqp \
134134
&& pecl install apcu \
135135
&& docker-php-ext-enable apcu \

Dockerfiles/mods/Dockerfile-7.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ RUN set -x \
219219
--enable-mysqlnd \
220220
--enable-coroutine \
221221
--enable-picohttpparser \
222-
--enable-timewheel \
222+
#`--enable-timewheel` \
223223
#`--enable-hugepage` \
224224
#`--enable-asan` \
225225
#`--with-phpx-dir=` \

0 commit comments

Comments
 (0)