From e7bcc4056e36f667f2503182ebcadb13587353b3 Mon Sep 17 00:00:00 2001 From: Florian Schlittenbauer Date: Tue, 16 May 2023 15:52:15 +0200 Subject: [PATCH] [BUGFIX] re-add missing slashes and remove some trailing whitespaces --- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1-alpine/Dockerfile | 8 ++++---- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2-alpine/Dockerfile | 8 ++++---- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3-alpine/Dockerfile | 8 ++++---- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4-alpine/Dockerfile | 8 ++++---- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0-alpine/Dockerfile | 8 ++++---- docker/php-official/8.0/Dockerfile | 4 ++-- docker/php-official/8.1-alpine/Dockerfile | 6 +++--- docker/php-official/8.1/Dockerfile | 2 +- docker/php-official/8.2-alpine/Dockerfile | 6 +++--- docker/php-official/8.2/Dockerfile | 2 +- template/Dockerfile/images/php.jinja2 | 14 +++++++------- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 218d9bdce..10bd00791 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 76f56d47e..96a0a2aea 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 7110d76cc..d6e0982e0 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 89e5de8f4..70edfec3d 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -160,7 +160,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 6ff12e8d4..b2284ae1f 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 70ccc4fbb..2cba3dfe8 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -159,7 +159,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index a727088bc..c4a26e972 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -166,8 +166,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index a03419855..4b180bfcd 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ @@ -159,7 +159,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 10fbc753a..39c064747 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,8 +171,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 9305f85fb..bde891ae6 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -158,7 +158,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 6bb56ea67..34cc8050d 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,8 +171,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 920246794..da69e01c5 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -163,7 +163,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index d03d2ad9e..b059983a4 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,7 +171,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index c585b910c..b48e517fd 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 615f1dba0..c0efa5960 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 -ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" @@ -142,7 +142,7 @@ RUN set -x \ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ @@ -171,7 +171,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index d61be512d..b068021e6 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -135,7 +135,7 @@ RUN set -x \ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index f7fcba2dc..9f6e2a35d 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -57,7 +57,7 @@ && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ && rm -rf master.zip guetzli-master \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} @@ -100,9 +100,9 @@ pdo_pgsql \ pgsql \ soap \ - sockets \ -{%- if version != '8.1' and version != '8.2' %} - tokenizer \ + sockets \ +{%- if version != '8.1' and version != '8.2' %} + tokenizer \ {%- endif %} sysvmsg \ sysvsem \ @@ -246,7 +246,7 @@ # https://github.com/docker-library/php/issues/240 && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ # Install new version of ICU - && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} @@ -286,9 +286,9 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} +{%- if version != '8.1' and version != '8.2' %} tokenizer \ -{%- endif %} +{%- endif %} sysvmsg \ sysvsem \ sysvshm \