diff --git a/php/Dockerfile.apache b/php/Dockerfile.apache index 874195f..3ecdb1d 100755 --- a/php/Dockerfile.apache +++ b/php/Dockerfile.apache @@ -10,8 +10,8 @@ FROM adeliom/php:${PHP_VERSION}-fpm # https://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.14.0 # https://git.alpinelinux.org/cgit/aports/tree/main/nginx/nginx.pre-install?h=v3.14.0 -ENV HTTPD_PREFIX /usr/local/apache2 -ENV PATH $HTTPD_PREFIX/bin:$PATH +ENV HTTPD_PREFIX="/usr/local/apache2" +ENV PATH="$HTTPD_PREFIX/bin:$PATH" RUN mkdir -p "$HTTPD_PREFIX" \ && chown www-data:www-data "$HTTPD_PREFIX" WORKDIR $HTTPD_PREFIX @@ -28,8 +28,8 @@ RUN set -eux; \ perl \ ; -ENV HTTPD_VERSION 2.4.58 -ENV HTTPD_SHA256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 +ENV HTTPD_VERSION="2.4.62" +ENV HTTPD_SHA256="674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec" # https://httpd.apache.org/security/vulnerabilities_24.html ENV HTTPD_PATCHES="" diff --git a/php/Dockerfile.apache-wkhtmltopdf b/php/Dockerfile.apache-wkhtmltopdf index 5d6c45b..5554c75 100755 --- a/php/Dockerfile.apache-wkhtmltopdf +++ b/php/Dockerfile.apache-wkhtmltopdf @@ -10,8 +10,8 @@ FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf # https://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.14.0 # https://git.alpinelinux.org/cgit/aports/tree/main/nginx/nginx.pre-install?h=v3.14.0 -ENV HTTPD_PREFIX /usr/local/apache2 -ENV PATH $HTTPD_PREFIX/bin:$PATH +ENV HTTPD_PREFIX="/usr/local/apache2" +ENV PATH="$HTTPD_PREFIX/bin:$PATH" RUN mkdir -p "$HTTPD_PREFIX" \ && chown www-data:www-data "$HTTPD_PREFIX" WORKDIR $HTTPD_PREFIX @@ -28,8 +28,8 @@ RUN set -eux; \ perl \ ; -ENV HTTPD_VERSION 2.4.58 -ENV HTTPD_SHA256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 +ENV HTTPD_VERSION="2.4.62" +ENV HTTPD_SHA256="674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec" # https://httpd.apache.org/security/vulnerabilities_24.html ENV HTTPD_PATCHES="" diff --git a/php/Dockerfile.caddy b/php/Dockerfile.caddy index d646a5e..b9cc362 100755 --- a/php/Dockerfile.caddy +++ b/php/Dockerfile.caddy @@ -20,8 +20,8 @@ RUN apk --update add --no-cache supervisor \ mailcap \ && rm -rf /tmp/* /var/cache/apk/* -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data +ENV XDG_CONFIG_HOME="/config" +ENV XDG_DATA_HOME="/data" ENV DOCUMENT_ROOT="/var/www/html/" diff --git a/php/Dockerfile.caddy-wkhtmltopdf b/php/Dockerfile.caddy-wkhtmltopdf index f6a0305..1440473 100755 --- a/php/Dockerfile.caddy-wkhtmltopdf +++ b/php/Dockerfile.caddy-wkhtmltopdf @@ -20,8 +20,8 @@ RUN apk --update add --no-cache supervisor \ mailcap \ && rm -rf /tmp/* /var/cache/apk/* -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data +ENV XDG_CONFIG_HOME="/config" +ENV XDG_DATA_HOME="/data" ENV DOCUMENT_ROOT="/var/www/html/" diff --git a/php/Dockerfile.cli b/php/Dockerfile.cli index 352910c..7be3414 100755 --- a/php/Dockerfile.cli +++ b/php/Dockerfile.cli @@ -80,7 +80,7 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer RUN apk add --no-cache gnu-libiconv libwebp-tools jpegoptim optipng pngquant mysql-client -ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php +ENV LD_PRELOAD='/usr/lib/preloadable_libiconv.so php' RUN mkdir -p /var/www/.composer && \ chown -R www-data:www-data /var/www diff --git a/php/Dockerfile.fpm b/php/Dockerfile.fpm index cde31a2..3b85b1b 100755 --- a/php/Dockerfile.fpm +++ b/php/Dockerfile.fpm @@ -82,7 +82,7 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer RUN apk add --no-cache gnu-libiconv libwebp-tools jpegoptim optipng pngquant mysql-client -ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php +ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php" COPY config/fpm/docker-healthcheck.sh /usr/local/bin/docker-healthcheck RUN chmod +x /usr/local/bin/docker-healthcheck diff --git a/php/Dockerfile.nginx b/php/Dockerfile.nginx index 8a719de..18c4e68 100755 --- a/php/Dockerfile.nginx +++ b/php/Dockerfile.nginx @@ -2,9 +2,9 @@ ARG PHP_VERSION FROM adeliom/php:${PHP_VERSION}-fpm -ENV NGINX_VERSION 1.24.0 -ENV PKG_RELEASE 1 -ENV NJS_VERSION 0.8.3 +ENV NGINX_VERSION="1.27.1" +ENV PKG_RELEASE="1" +ENV NJS_VERSION="0.8.5" RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants diff --git a/php/Dockerfile.nginx-wkhtmltopdf b/php/Dockerfile.nginx-wkhtmltopdf index a161007..7a2aea0 100755 --- a/php/Dockerfile.nginx-wkhtmltopdf +++ b/php/Dockerfile.nginx-wkhtmltopdf @@ -2,9 +2,9 @@ ARG PHP_VERSION FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf -ENV NGINX_VERSION 1.24.0 -ENV PKG_RELEASE 1 -ENV NJS_VERSION 0.8.3 +ENV NGINX_VERSION="1.27.1" +ENV PKG_RELEASE="1" +ENV NJS_VERSION="0.8.5" RUN set -x \ # create nginx user/group first, to be consistent throughout docker variants