Merge pull request #498 from SUSE/for-deploy-5

🤖: Update build recipes for SP5
SUSE · Jul 6, 2023 · 0aa7196 · 0aa7196
2 parents 6f395e5 + 3cde253
commit 0aa7196
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/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 <[email protected]>
+
+- 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 <[email protected]>
 

diff --git 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
@@ -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
@@ -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
@@ -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/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 <[email protected]>
+
+- 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 <[email protected]>
 

diff --git 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
@@ -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
@@ -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
@@ -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/php8-image.changes b/php8-image/php8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul  6 10:15:24 UTC 2023 - Dirk Mueller <[email protected]>
+
+- 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 <[email protected]>