Accepting request 1247777 from devel:BCI:Tumbleweed

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

OBS-URL: https://build.opensuse.org/request/show/1247777
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-client-image?expand=0&rev=34

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,32 +13,41 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
-
-#!BuildTag: opensuse/mariadb-client:11.4
-#!BuildTag: opensuse/mariadb-client:11.4-%RELEASE%
+#!UseOBSRepositories
+#!ExclusiveArch: aarch64 ppc64le s390x x86_64
+#!BuildTag: opensuse/mariadb-client:%%mariadb_version%%-%RELEASE%
+#!BuildTag: opensuse/mariadb-client:%%mariadb_version%%
+#!BuildTag: opensuse/mariadb-client:11.7
 #!BuildTag: opensuse/mariadb-client:latest
 
-FROM opensuse/tumbleweed:latest
-
-RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+FROM opensuse/bci/bci-micro:latest AS target
+FROM opensuse/tumbleweed:latest AS builder
+COPY --from=target / /target
 
+RUN set -euo pipefail; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends mariadb-client; \
+    zypper -n clean; \
+    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
+# sanity check that the version from the tag is equal to the version of mariadb-client that we expect
+RUN set -euo pipefail; \
+    [ "$(rpm --root /target -q --qf '%{version}' mariadb-client | \
+    cut -d '.' -f -2)" = "11.7" ]
+FROM opensuse/bci/bci-micro:latest
+COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.mariadb-client
-LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Client"
 LABEL org.opencontainers.image.description="MariaDB Client container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="11.4"
+LABEL org.opencontainers.image.version="%%mariadb_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="11.4-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.4-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%mariadb_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:%%mariadb_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"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-client-image/README.md"
 CMD ["mariadb"]
-# sanity check that the version from the tag is equal to the version of mariadb-client that we expect
-RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.4" ]

README.md

@@ -13,13 +13,13 @@ This image contains the [MariaDB client](https://mariadb.com/kb/en/mariadb-comma
 To connect to a MariaDB instance, run the following command:
 
 ```ShellSession
-$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb -h $HOST_IP -u root -p
+$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.7 mariadb -h $HOST_IP -u root -p
 ```
 
 Use the command below to dump all databases:
 
 ```ShellSession
-$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
+$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.7 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
 ```
 
 ## Utilities

_service

@@ -1,4 +1,9 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%mariadb_version%%</param>
+    <param name="package">mariadb-client</param>
+  </service>
 </services>

mariadb-client-image.changes

@@ -1,3 +1,78 @@
+-------------------------------------------------------------------
+Fri Feb 21 10:12:28 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- Bump mariadb version to 11.7
+
+-------------------------------------------------------------------
+Fri Jan 31 13:55:15 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- set exclusivearch to exclude 32bit platforms from building
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
+Mon Nov 25 11:56:07 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Switch to a multistage build and base the final image on micro
+
+-------------------------------------------------------------------
+Mon Nov 18 09:27:58 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- update to 11.6 mariadb
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
+Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- set useobsrepositories explicitly
+
+-------------------------------------------------------------------
+Thu Sep 12 06:35:48 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- set full version in labels of mariadb* container
+
+-------------------------------------------------------------------
+Mon Sep  9 06:51:05 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- Bump main package version
+
 -------------------------------------------------------------------
 Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>