From 40d49cb430d77b991d80db8ed3804f0e61c96a7f Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 6 Jul 2023 09:57:06 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- php-apache8-image/Dockerfile | 2 +- php-apache8-image/docker-php-ext-configure | 2 +- php-apache8-image/docker-php-ext-enable | 2 +- php-apache8-image/docker-php-source | 2 +- php-fpm8-image/Dockerfile | 6 +++--- php-fpm8-image/docker-php-ext-configure | 2 +- php-fpm8-image/docker-php-ext-enable | 2 +- php-fpm8-image/docker-php-source | 2 +- php8-image/Dockerfile | 2 +- php8-image/docker-php-ext-configure | 2 +- php8-image/docker-php-ext-enable | 2 +- php8-image/docker-php-source | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile index 19d1f8536..e745b5eb0 100644 --- a/php-apache8-image/Dockerfile +++ b/php-apache8-image/Dockerfile @@ -24,7 +24,7 @@ LABEL com.suse.image-type="sle-bci" LABEL com.suse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer php8-curl php8-zip php8-zlib php8-phar php8-mbstring apache2-mod_php8; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring apache2-mod_php8; zypper -n clean; rm -rf /var/log/* ENV PHP_VERSION="%%php_version%%" ENV PHP_INI_DIR="/etc/php8/" ENV PHPIZE_DEPS="php8-devel awk make" diff --git a/php-apache8-image/docker-php-ext-configure b/php-apache8-image/docker-php-ext-configure index 570c0a887..f16eab8f4 100644 --- a/php-apache8-image/docker-php-ext-configure +++ b/php-apache8-image/docker-php-ext-configure @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php-apache8-image/docker-php-ext-enable b/php-apache8-image/docker-php-ext-enable index 570c0a887..f16eab8f4 100644 --- a/php-apache8-image/docker-php-ext-enable +++ b/php-apache8-image/docker-php-ext-enable @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php-apache8-image/docker-php-source b/php-apache8-image/docker-php-source index 570c0a887..f16eab8f4 100644 --- a/php-apache8-image/docker-php-source +++ b/php-apache8-image/docker-php-source @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile index 11639472d..57d91c77b 100644 --- a/php-fpm8-image/Dockerfile +++ b/php-fpm8-image/Dockerfile @@ -24,7 +24,7 @@ LABEL com.suse.image-type="sle-bci" LABEL com.suse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer php8-curl php8-zip php8-zlib php8-phar php8-mbstring php8-fpm; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring php8-fpm; zypper -n clean; rm -rf /var/log/* ENV PHP_VERSION="%%php_version%%" ENV PHP_INI_DIR="/etc/php8/" ENV PHPIZE_DEPS="php8-devel awk make" @@ -38,8 +38,8 @@ WORKDIR /srv/www/htdocs RUN set -euo pipefail; \ cd /etc/php8/fpm/; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - cp php-fpm.conf.default php-fpm.conf; \ + test -e php-fpm.d/www.conf.default && cp -p php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + test -e php-fpm.conf.default && cp -p php-fpm.conf.default php-fpm.conf; \ { \ echo '[global]'; \ echo 'error_log = /proc/self/fd/2'; \ diff --git a/php-fpm8-image/docker-php-ext-configure b/php-fpm8-image/docker-php-ext-configure index 570c0a887..f16eab8f4 100644 --- a/php-fpm8-image/docker-php-ext-configure +++ b/php-fpm8-image/docker-php-ext-configure @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php-fpm8-image/docker-php-ext-enable b/php-fpm8-image/docker-php-ext-enable index 570c0a887..f16eab8f4 100644 --- a/php-fpm8-image/docker-php-ext-enable +++ b/php-fpm8-image/docker-php-ext-enable @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php-fpm8-image/docker-php-source b/php-fpm8-image/docker-php-source index 570c0a887..f16eab8f4 100644 --- a/php-fpm8-image/docker-php-source +++ b/php-fpm8-image/docker-php-source @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile index 00cdf0250..3b7d16e92 100644 --- a/php8-image/Dockerfile +++ b/php8-image/Dockerfile @@ -24,7 +24,7 @@ LABEL com.suse.image-type="sle-bci" LABEL com.suse.release-stage="released" # endlabelprefix -RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer php8-curl php8-zip php8-zlib php8-phar php8-mbstring; zypper -n clean; rm -rf /var/log/* +RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring; zypper -n clean; rm -rf /var/log/* ENV PHP_VERSION="%%php_version%%" ENV PHP_INI_DIR="/etc/php8/" ENV PHPIZE_DEPS="php8-devel awk make" diff --git a/php8-image/docker-php-ext-configure b/php8-image/docker-php-ext-configure index 570c0a887..f16eab8f4 100644 --- a/php8-image/docker-php-ext-configure +++ b/php8-image/docker-php-ext-configure @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php8-image/docker-php-ext-enable b/php8-image/docker-php-ext-enable index 570c0a887..f16eab8f4 100644 --- a/php8-image/docker-php-ext-enable +++ b/php8-image/docker-php-ext-enable @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." diff --git a/php8-image/docker-php-source b/php8-image/docker-php-source index 570c0a887..f16eab8f4 100644 --- a/php8-image/docker-php-source +++ b/php8-image/docker-php-source @@ -1,2 +1,2 @@ #!/bin/sh -echo "This script is not required in the PHP SLE BCI." +echo "This script is not required in this PHP container." From 3cde2539fc371fb465c35f7bf18f0898dbad4afa Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 6 Jul 2023 10:15:24 +0000 Subject: [PATCH 2/2] Update changelogs for php-fpm8-image, php-apache8-image, php8-image --- php-apache8-image/php-apache8-image.changes | 5 +++++ php-fpm8-image/php-fpm8-image.changes | 5 +++++ php8-image/php8-image.changes | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/php-apache8-image/php-apache8-image.changes b/php-apache8-image/php-apache8-image.changes index 9a9e75986..7fc90ba47 100644 --- a/php-apache8-image/php-apache8-image.changes +++ b/php-apache8-image/php-apache8-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 6 10:15:24 UTC 2023 - Dirk Mueller + +- Correct the php-composer package name to php-composer2 and improve the message in docker-php-ext-configure + ------------------------------------------------------------------- Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller diff --git a/php-fpm8-image/php-fpm8-image.changes b/php-fpm8-image/php-fpm8-image.changes index 43c2d165d..d05ad0683 100644 --- a/php-fpm8-image/php-fpm8-image.changes +++ b/php-fpm8-image/php-fpm8-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 6 10:15:24 UTC 2023 - Dirk Mueller + +- Correct the php-composer package name to php-composer2 and improve the message in docker-php-ext-configure + ------------------------------------------------------------------- Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller diff --git a/php8-image/php8-image.changes b/php8-image/php8-image.changes index d94cfe796..73b925c02 100644 --- a/php8-image/php8-image.changes +++ b/php8-image/php8-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 6 10:15:24 UTC 2023 - Dirk Mueller + +- Correct the php-composer package name to php-composer2 and improve the message in docker-php-ext-configure + ------------------------------------------------------------------- Fri Jun 23 13:44:59 UTC 2023 - Dirk Mueller