Merge pull request #29 from devilbox/release-0.20

Fix dependencies
devilbox · May 27, 2018 · c4a75f6 · c4a75f6
2 parents c738979 + d081de8
commit c4a75f6
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 82 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -30,6 +30,7 @@ ENV BUILD_DEPS \
 	libvpx-dev \
 	zlib1g-dev \
 	libfreetype6-dev \
+	libwebp-dev \
 	libgmp-dev \
 	libmagickwand-dev \
 	libc-client-dev \
@@ -57,7 +58,6 @@ ENV BUILD_DEPS \
 	libpq-dev \
 	libsqlite3-dev \
 	libpq-dev \
-	libssl-dev \
 	libpspell-dev \
 	libedit-dev \
 	libreadline-dev \
@@ -83,31 +83,32 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
-	librabbitmq1 \
+	librabbitmq4 \
 	libenchant1c2a \
-	libpng12-0 \
+	libpng16-16 \
 	libjpeg62-turbo \
 	libxpm4 \
-	libvpx1 \
+	libvpx4 \
 	libfreetype6 \
-	libmagickwand-6.q16-2 \
+	libwebp6 \
+	libmagickwand-6.q16-3 \
 	libc-client2007e \
 	libfbclient2 \
-	libicu52 \
+	libicu57 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libmysqlclient18 \
+	libmariadbclient18 \
 	libsybdb5 \
 	libfbclient2 \
 	libpq5 \
 	libpq5 \
 	libaspell15 \
 	librecode0 \
 	snmp \
-	libnghttp2-5 \
-	libtidy-0.99-0 \
+	libnghttp2-14 \
+	libtidy5 \
 	libxslt1.1 \
-	libzip2 \
+	libzip4 \
 	ca-certificates
 
 
@@ -199,7 +200,6 @@ RUN set -x \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& cd / && rm -rf /tmp/phalcon \
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \
@@ -351,8 +351,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
 	&& php-fpm -m | grep -oiE '^phalcon$' \
-	&& php -m | grep -oiE '^phar$' \
-	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
 	&& php -m | grep -oiE '^pspell$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
@@ -81,18 +81,18 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
-	librabbitmq1 \
+	librabbitmq4 \
 	libenchant1c2a \
-	libpng12-0 \
+	libpng16-16 \
 	libjpeg62-turbo \
 	libxpm4 \
-	libvpx1 \
+	libvpx4 \
 	libfreetype6 \
-	libwebp-dev \
-	libmagickwand-6.q16-2 \
+	libwebp6 \
+	libmagickwand-6.q16-3 \
 	libc-client2007e \
 	libfbclient2 \
-	libicu52 \
+	libicu57 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libsybdb5 \
@@ -102,10 +102,10 @@ ENV RUN_DEPS \
 	libaspell15 \
 	librecode0 \
 	snmp \
-	libnghttp2-5 \
-	libtidy-0.99-0 \
+	libnghttp2-14 \
+	libtidy5 \
 	libxslt1.1 \
-	libzip2 \
+	libzip4 \
 	ca-certificates
 
 

diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
@@ -81,18 +81,18 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
-	librabbitmq1 \
+	librabbitmq4 \
 	libenchant1c2a \
-	libpng12-0 \
+	libpng16-16 \
 	libjpeg62-turbo \
 	libxpm4 \
-	libvpx1 \
+	libvpx4 \
 	libfreetype6 \
-	libwebp-dev \
-	libmagickwand-6.q16-2 \
+	libwebp6 \
+	libmagickwand-6.q16-3 \
 	libc-client2007e \
 	libfbclient2 \
-	libicu52 \
+	libicu57 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libsybdb5 \
@@ -102,10 +102,10 @@ ENV RUN_DEPS \
 	libaspell15 \
 	librecode0 \
 	snmp \
-	libnghttp2-5 \
-	libtidy-0.99-0 \
+	libnghttp2-14 \
+	libtidy5 \
 	libxslt1.1 \
-	libzip2 \
+	libzip4 \
 	ca-certificates
 
 

diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -129,7 +129,7 @@ RUN set -x \
 && rm -rf ioncube \
 && rm -rf ioncube.tar.gz \
  \
-	&& pecl install amqp \
+	&& echo "/usr" | pecl install amqp \
 	&& docker-php-ext-enable amqp \
 	&& pecl install apcu \
 	&& docker-php-ext-enable apcu \

diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -219,7 +219,7 @@ RUN set -x \
   --enable-mysqlnd \
   --enable-coroutine \
   --enable-picohttpparser \
-  --enable-timewheel \
+  #`--enable-timewheel` \
   #`--enable-hugepage` \
   #`--enable-asan` \
   #`--with-phpx-dir=` \