Regenerate Dockerfiles

2025-12-11 19:41:16 +00:00 · 2018-02-23 09:22:54 +01:00
parent 308d5c92bf
commit c11c94ebe4
12 changed files with 48 additions and 6 deletions
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -64,7 +65,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	libssl-dev \
 	zlib1g-dev \
 	libmagickwand-dev \
@@ -108,6 +108,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install tokenizer \
 	&& /usr/local/bin/docker-php-ext-install dba \
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -69,7 +70,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	zlib1g-dev \
 	libmagickwand-dev \
 	zlib1g-dev \
@@ -113,6 +113,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -70,7 +71,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	zlib1g-dev \
 	libmagickwand-dev \
 	zlib1g-dev \
@@ -115,6 +115,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -70,7 +71,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	libmagickwand-dev \
 	zlib1g-dev \
 	libmemcached-dev \
@@ -115,6 +115,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -70,7 +71,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	libmagickwand-dev \
 	zlib1g-dev \
 	libmemcached-dev \
@@ -115,6 +115,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -18,6 +18,7 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	zlib1g-dev \
 	libicu-dev \
 	libtidy-dev \
 	libssl-dev \
@@ -70,7 +71,6 @@ ENV BUILD_DEPS \
 	librabbitmq-dev \
 	libnghttp2-dev \
 	libssl-dev \
-	libnghttp2-5 \
 	libmagickwand-dev \
 	libmcrypt-dev \
 	zlib1g-dev \
@@ -116,6 +116,7 @@ RUN set -x \
 		${BUILD_DEPS} \
 	\
 	\
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -307,6 +307,12 @@ VOLUME /var/mail
 EXPOSE 9000


+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
 ###
 ### Entrypoint
 ###