Accepting request 1241378 from devel:BCI:Tumbleweed

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

OBS-URL: https://build.opensuse.org/request/show/1241378
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/php-apache8-image?expand=0&rev=32

Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-#     Copyright (c) 2024 SUSE LLC
+#     Copyright (c) 2025 SUSE LLC
 
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,27 +13,31 @@
 # 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-apache:%%php_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/php-apache:%%php_version%%
 #!BuildTag: opensuse/bci/php-apache:8
-#!BuildTag: opensuse/bci/php-apache:8-%RELEASE%
 #!BuildTag: opensuse/bci/php-apache:latest
 
 FROM opensuse/tumbleweed:latest
 
-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/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; \
+    zypper -n install php8 php8-cli php-composer2 php8-curl php8-zip php8-zlib php8-phar php8-mbstring apache2-mod_php8; \
+    zypper -n clean; \
+    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.php-apache
-LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI PHP-Apache 8"
 LABEL org.opencontainers.image.description="PHP-Apache 8 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="8"
+LABEL org.opencontainers.image.version="%%php_version%%"
 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="8-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%php_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/php-apache:8-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/php-apache:%%php_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

README.md

@@ -35,7 +35,7 @@ Alternatively, you can mount the application's source code directly into the
 container:
 
 ```ShellSession
-$ podman run -d -p 8080:80 -v ./app/:/srv/www/htdocs:Z registry.opensuse.org/opensuse/bci/php-apache:8-%RELEASE%
+$ podman run -d -p 8080:80 -v ./app/:/srv/www/htdocs:Z registry.opensuse.org/opensuse/bci/php-apache:8
 ```
 
 ## How to install PHP extensions
@@ -68,7 +68,7 @@ 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.
 
-PECL extensions can be installed as follows:
+Install PECL extensions as follows:
 
 ```Dockerfile
 FROM registry.opensuse.org/opensuse/bci/php-apache:8
@@ -78,16 +78,16 @@ RUN set -euo pipefail; \
     pecl install APCu-5.1.21;
 ```
 
-**Note:** Building an extension may require installing additional dependencies.
+**Note:** Building an extension may require installing its dependencies first.
 
 
 ## 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`. Note that only
+`docker-php-ext-enable`, and `docker-php-ext-install`.
-`docker-php-ext-install` performs an actual job. None of the other scripts
+The script `docker-php-ext-install` performs an actual job, all others are
-require to be executed in the image.
+just no-operation scripts for interoperability.
 
 ## Licensing
 

_service

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

php-apache8-image.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+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>