Accepting request 1193935 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1193935
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/php8-image?expand=0&rev=19

Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-#     Copyright (c) 2026 SUSE LLC
+#     Copyright (c) 2024 SUSE LLC
 
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,50 +13,37 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
-#!UseOBSRepositories
 
-#!BuildTag: opensuse/bci/php:%%php_version%%-%RELEASE%
-#!BuildTag: opensuse/bci/php:%%php_version%%
 #!BuildTag: opensuse/bci/php:8
+#!BuildTag: opensuse/bci/php:8-%RELEASE%
 #!BuildTag: opensuse/bci/php:latest
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; \
-    zypper -n install php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring php8-readline
-
-# cleanup logs and temporary files
-RUN set -euo pipefail; zypper -n clean -a; \
-    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}; \
-    rm -rf {/target,}/run/*; \
-    rm -f {/target,}/etc/{shadow-,group-,passwd-,.pwd.lock}; \
-    rm -f {/target,}/usr/lib/sysimage/rpm/.rpm.lock; \
-    rm -f {/target,}/var/cache/ldconfig/aux-cache; \
-    command -v zypper >/dev/null 2>&1 || rm -f /var/lib/zypp/AutoInstalled
-
-# set the day of last password change to empty
-RUN set -euo pipefail; sed -i 's/^\([^:]*:[^:]*:\)[^:]*\(:.*\)$/\1\2/' /etc/shadow
+RUN set -euo pipefail; zypper -n in php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring php8-readline; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.php
+LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI PHP 8"
 LABEL org.opencontainers.image.description="PHP 8 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="%%php_version%%"
+LABEL org.opencontainers.image.version="8"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="%%php_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/php:%%php_version%%-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/php:8-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
 # endlabelprefix
-LABEL io.artifacthub.package.readme-url="%SOURCEURL_WITH(README.md)%"
-ENV COMPOSER_VERSION="%%composer_version%%"
-ENV PHPIZE_DEPS="php8-devel awk make findutils"
-ENV PHP_INI_DIR="/etc/php8/"
+LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/php8-image/README.md"
 ENV PHP_VERSION="%%php_version%%"
+ENV PHP_INI_DIR="/etc/php8/"
+ENV PHPIZE_DEPS="php8-devel awk make findutils"
+ENV COMPOSER_VERSION="%%composer_version%%"
+
 ENTRYPOINT ["docker-php-entrypoint"]
 CMD ["php", "-a"]
 COPY docker-php-source docker-php-entrypoint docker-php-ext-configure docker-php-ext-enable docker-php-ext-install /usr/local/bin/

README.md

@@ -40,7 +40,7 @@ and they can be installed as follows:
 ```Dockerfile
 FROM registry.opensuse.org/opensuse/bci/php:8
 
-RUN zypper -n install php8-gd php8-intl
+RUN zypper -n in php8-gd php8-intl
 ```
 
 Alternatively, you can use the `docker-php-ext-install` script. It is provided
@@ -61,26 +61,26 @@ RUN docker-php-ext-install gd intl
 can be used as an alternative source to obtain PHP extensions, but without any
 guarantee of interoperability with this image and without any official support.
 
-Install PECL extensions as follows:
+PECL extensions can be installed as follows:
 
 ```Dockerfile
 FROM registry.opensuse.org/opensuse/bci/php:8
 
 RUN set -euo pipefail; \
-    zypper -n install $PHPIZE_DEPS php8-pecl; \
+    zypper -n in $PHPIZE_DEPS php8-pecl; \
     pecl install APCu-5.1.21;
 ```
 
-**Note:** Building an extension may require installing its dependencies first.
+**Note:** Building an extension may require installing additional dependencies.
 
 
 ## Compatibility with the DockerHub Image
 
 The following scripts ship with the image to keep it compatible with the
 DockerHub image: `docker-php-source`, `docker-php-ext-configure`,
-`docker-php-ext-enable`, and `docker-php-ext-install`.
-The script `docker-php-ext-install` performs an actual job, all others are
-just no-operation scripts for interoperability.
+`docker-php-ext-enable`, and `docker-php-ext-install`. Note that only
+`docker-php-ext-install` performs an actual job. None of the other scripts
+require to be executed in the image.
 
 ## Licensing
 

_service

@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%composer_version%%</param>
     <param name="package">php-composer2</param>
   </service>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%php_version%%</param>
     <param name="package">php8</param>

docker-php-ext-install

@@ -7,4 +7,4 @@ for ext in $@; do
     [[ "$ext" =~ ^- ]] || extensions+=("php8-$ext")
 done
 
-zypper -n install ${extensions[*]}
+zypper -n in ${extensions[*]}

php8-image.changes

@@ -1,103 +1,3 @@
--------------------------------------------------------------------
-Thu Jan  1 14:16:34 UTC 2026 - SUSE Update Bot <bci-internal@suse.de>
-
-- update copyright year
-
--------------------------------------------------------------------
-Fri Nov 21 23:05:09 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- use long form commands
-
--------------------------------------------------------------------
-Mon Oct 20 12:53:40 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove password change date from /etc/shadow to make the file reproducible
-
--------------------------------------------------------------------
-Mon Sep 29 09:32:29 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove non-reproducible files from container
-
--------------------------------------------------------------------
-Thu Jul 31 11:18:59 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove shadow backup from container
-
--------------------------------------------------------------------
-Fri Jul 11 10:46:14 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- order ENVs alphanumerically
-
--------------------------------------------------------------------
-Fri May 23 11:23:16 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- use SOURCEURL_WITH to generate proper artifacthub urls
-
--------------------------------------------------------------------
-Mon Apr 28 10:47:42 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- zypper clean also the system repository from the container
-
--------------------------------------------------------------------
-Mon Apr 14 08:40:50 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- stylistic changes to pass dockerfmt
-
--------------------------------------------------------------------
-Wed Jan  1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- update copyright year
-
--------------------------------------------------------------------
-Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Change attribute order in _service
-
--------------------------------------------------------------------
-Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-
--------------------------------------------------------------------
-Tue Oct 29 15:23:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- drop tag_version-%RELEASE%
-
--------------------------------------------------------------------
-Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
-
--------------------------------------------------------------------
-Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the tag with -%RELEASE% the first tag listed
-
--------------------------------------------------------------------
-Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rerender installation step in multiple lines, allow uninstalling optional packages
-
--------------------------------------------------------------------
-Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- improved log cleaning
-
--------------------------------------------------------------------
-Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- remove release tags for additional_versions
-
--------------------------------------------------------------------
-Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set useobsrepositories explicitly
-
--------------------------------------------------------------------
-Wed Sep 11 08:07:25 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- use full version in php container labels
-
 -------------------------------------------------------------------
 Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>