diff --git a/images/runtime/php-fpm/8.2/bullseye.Dockerfile b/images/runtime/php-fpm/8.2/bullseye.Dockerfile index 0eb5df9f79..32bf0a129b 100644 --- a/images/runtime/php-fpm/8.2/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.2/bullseye.Dockerfile @@ -287,7 +287,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian bullseye nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN yes '' | apt-get install nginx=1.30.0-1~bullseye -y +RUN yes '' | apt-get install nginx -y RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -310,8 +310,8 @@ RUN nginx -t ENV NGINX_PORT 8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -321,7 +321,6 @@ RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc uni RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl diff --git a/images/runtime/php-fpm/8.3/bookworm.Dockerfile b/images/runtime/php-fpm/8.3/bookworm.Dockerfile index 119c0b0d1c..1d1a7ccbca 100644 --- a/images/runtime/php-fpm/8.3/bookworm.Dockerfile +++ b/images/runtime/php-fpm/8.3/bookworm.Dockerfile @@ -281,7 +281,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian bookworm nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN yes '' | apt-get install nginx=1.30.0-1~bookworm -y +RUN yes '' | apt-get install nginx -y RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -304,8 +304,8 @@ RUN nginx -t ENV NGINX_PORT 8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -315,7 +315,6 @@ RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc uni RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl diff --git a/images/runtime/php-fpm/8.3/bullseye.Dockerfile b/images/runtime/php-fpm/8.3/bullseye.Dockerfile index 3a2720bcf1..f19ac4aa4c 100644 --- a/images/runtime/php-fpm/8.3/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.3/bullseye.Dockerfile @@ -286,7 +286,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian bullseye nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN yes '' | apt-get install nginx=1.30.0-1~bullseye -y +RUN yes '' | apt-get install nginx -y RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -309,8 +309,8 @@ RUN nginx -t ENV NGINX_PORT 8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -320,7 +320,6 @@ RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc uni RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl diff --git a/images/runtime/php-fpm/8.4/bookworm.Dockerfile b/images/runtime/php-fpm/8.4/bookworm.Dockerfile index dfb93bc3de..1b5f151d94 100644 --- a/images/runtime/php-fpm/8.4/bookworm.Dockerfile +++ b/images/runtime/php-fpm/8.4/bookworm.Dockerfile @@ -281,7 +281,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian bookworm nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN yes '' | apt-get install nginx=1.30.0-1~bookworm -y +RUN yes '' | apt-get install nginx -y RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -304,8 +304,8 @@ RUN nginx -t ENV NGINX_PORT 8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -315,7 +315,6 @@ RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc uni RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ # From php 8.4 version imap is removed from php core and moved to pecl diff --git a/images/runtime/php-fpm/8.4/bullseye.Dockerfile b/images/runtime/php-fpm/8.4/bullseye.Dockerfile index a3f6f17c1e..ebca74c655 100644 --- a/images/runtime/php-fpm/8.4/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.4/bullseye.Dockerfile @@ -286,7 +286,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian bullseye nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN yes '' | apt-get install nginx=1.30.0-1~bullseye -y +RUN yes '' | apt-get install nginx -y RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -309,8 +309,8 @@ RUN nginx -t ENV NGINX_PORT 8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -320,7 +320,6 @@ RUN apt-mark hold msodbcsql17 msodbcsql18 odbcinst1debian2 odbcinst unixodbc uni RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ # From php 8.4 version imap is removed from php core and moved to pecl diff --git a/images/runtime/php-fpm/8.5/noble.Dockerfile b/images/runtime/php-fpm/8.5/noble.Dockerfile index f8a52b0c72..33ab53394e 100644 --- a/images/runtime/php-fpm/8.5/noble.Dockerfile +++ b/images/runtime/php-fpm/8.5/noble.Dockerfile @@ -282,7 +282,7 @@ RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/ || { echo "ERROR: nginx signing key fingerprint mismatch"; exit 1; } \ && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/ubuntu noble nginx" > /etc/apt/sources.list.d/nginx.list RUN apt-get update -RUN apt-get install -y nginx=1.30.0-1~noble +RUN apt-get install -y nginx RUN rm -f /etc/nginx/conf.d/default.conf COPY images/runtime/php-fpm/nginx_conf/default.conf /etc/nginx/conf.d/default.conf # Patch nginx.conf for behavioral parity with previous Debian/Sury nginx package @@ -305,8 +305,8 @@ RUN nginx -t ENV NGINX_PORT=8080 # Install common PHP extensions -# TEMPORARY: Holding odbc related packages and nginx from upgrading. -RUN apt-mark hold msodbcsql18 unixodbc unixodbc-dev nginx \ +# TEMPORARY: Holding odbc related packages from upgrading. +RUN apt-mark hold msodbcsql18 unixodbc unixodbc-dev \ && apt-get update \ && apt-get upgrade -y \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ @@ -316,7 +316,6 @@ RUN apt-mark hold msodbcsql18 unixodbc unixodbc-dev nginx \ RUN set -eux; \ apt-get update \ && apt-get upgrade -y \ - && apt-mark unhold nginx \ && apt-get install -y --no-install-recommends apache2-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ # From php 8.4 version imap is removed from php core and moved to pecl