Merge pull request #1621 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed

kiwi-image/Dockerfile

@@ -18,8 +18,8 @@
 #!BuildTag: opensuse/bci/kiwi:10-%RELEASE%
 #!BuildTag: opensuse/bci/kiwi:10.1
 #!BuildTag: opensuse/bci/kiwi:10.1-%RELEASE%
-#!BuildTag: opensuse/bci/kiwi:10.1.4
-#!BuildTag: opensuse/bci/kiwi:10.1.4-%RELEASE%
+#!BuildTag: opensuse/bci/kiwi:10.1.6
+#!BuildTag: opensuse/bci/kiwi:10.1.6-%RELEASE%
 #!BuildTag: opensuse/bci/kiwi:latest
 
 FROM opensuse/tumbleweed:latest
@@ -31,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-r
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI KIWI Appliance Builder (kiwi)"
 LABEL org.opencontainers.image.description="KIWI Appliance Builder (kiwi) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported in privileged mode."
-LABEL org.opencontainers.image.version="10.1.4"
+LABEL org.opencontainers.image.version="10.1.6"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"

kiwi-image/kiwi-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 06:51:05 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Bump main package version
+
 -------------------------------------------------------------------
 Thu Sep  5 06:33:31 UTC 2024 - Dan Čermák <[email protected]>
 

mariadb-client-image/Dockerfile

@@ -14,8 +14,8 @@
 # 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%
+#!BuildTag: opensuse/mariadb-client:11.5
+#!BuildTag: opensuse/mariadb-client:11.5-%RELEASE%
 #!BuildTag: opensuse/mariadb-client:latest
 
 FROM opensuse/tumbleweed:latest
@@ -27,18 +27,18 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n cl
 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="11.5"
 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="11.5-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.5-%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" ]
+RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ]

mariadb-client-image/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.5 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.5 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
 ```
 
 ## Utilities

mariadb-client-image/mariadb-client-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 06:51:05 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Bump main package version
+
 -------------------------------------------------------------------
 Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <[email protected]>
 

mariadb-image/Dockerfile

@@ -14,8 +14,8 @@
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
 
-#!BuildTag: opensuse/mariadb:11.4
-#!BuildTag: opensuse/mariadb:11.4-%RELEASE%
+#!BuildTag: opensuse/mariadb:11.5
+#!BuildTag: opensuse/mariadb:11.5-%RELEASE%
 #!BuildTag: opensuse/mariadb:latest
 
 FROM opensuse/tumbleweed:latest
@@ -27,13 +27,13 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk t
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Server"
 LABEL org.opencontainers.image.description="MariaDB Server container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="11.4"
+LABEL org.opencontainers.image.version="11.5"
 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:11.4-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.5-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
@@ -43,7 +43,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["mariadbd"]
 EXPOSE 3306
 # 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" ]
+RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ]
 
 RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d
 

mariadb-image/README.md

@@ -12,13 +12,13 @@ By default, the image launches MariaDB with the same configuration that comes wi
 The only environment variable required to start the container is the MariaDB root password.
 
 ```ShellSession
-$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5
 ```
 
 or:
 
 ```ShellSession
-$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.4
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.5
 ```
 
 ### Volumes
@@ -33,7 +33,7 @@ When using the MariaDB image, we recommend one of the following options:
 To mount a host directory as a volume for your data run the following command:
 
 ```ShellSession
-$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4
+$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5
 ```
 
 The `-v /my/own/datadir:/var/lib/mysql:Z` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MariaDB will by default write its data files.

mariadb-image/mariadb-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 06:51:05 UTC 2024 - Dirk Mueller <[email protected]>
+
+- Bump main package version
+
 -------------------------------------------------------------------
 Wed Sep  4 11:25:11 UTC 2024 - Dan Čermák <[email protected]>
 

postgres-12-image/Dockerfile

@@ -16,8 +16,10 @@
 
 #!BuildTag: opensuse/postgres:12
 #!BuildTag: opensuse/postgres:12-%RELEASE%
-#!BuildTag: opensuse/postgres:%%pg_version%%
-#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server findutil
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 12"
 LABEL org.opencontainers.image.description="PostgreSQL 12 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="12"
+LABEL org.opencontainers.image.version="%%pg_patch_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
@@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-12-image/README.md"
 ENV LANG="en_US.utf8"
 ENV PG_MAJOR="12"
-ENV PG_VERSION="%%pg_version%%"
+ENV PG_VERSION="%%pg_minor_version%%"
 ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

postgres-12-image/_service

@@ -3,8 +3,13 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_version%%</param>
+    <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql12-server</param>
     <param name="parse-version">minor</param>
   </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%pg_patch_version%%</param>
+    <param name="package">postgresql12-server</param>
+  </service>
 </services>

postgres-12-image/postgres-12-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 07:25:11 UTC 2024 - Dirk Mueller <[email protected]>
+
+- set full version on labels and tags
+
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <[email protected]>
 

postgres-13-image/Dockerfile

@@ -16,8 +16,10 @@
 
 #!BuildTag: opensuse/postgres:13
 #!BuildTag: opensuse/postgres:13-%RELEASE%
-#!BuildTag: opensuse/postgres:%%pg_version%%
-#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql13-server findutil
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 13"
 LABEL org.opencontainers.image.description="PostgreSQL 13 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="13"
+LABEL org.opencontainers.image.version="%%pg_patch_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
@@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-13-image/README.md"
 ENV LANG="en_US.utf8"
 ENV PG_MAJOR="13"
-ENV PG_VERSION="%%pg_version%%"
+ENV PG_VERSION="%%pg_minor_version%%"
 ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

postgres-13-image/_service

@@ -3,8 +3,13 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_version%%</param>
+    <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql13-server</param>
     <param name="parse-version">minor</param>
   </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%pg_patch_version%%</param>
+    <param name="package">postgresql13-server</param>
+  </service>
 </services>

postgres-13-image/postgres-13-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 07:25:11 UTC 2024 - Dirk Mueller <[email protected]>
+
+- set full version on labels and tags
+
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <[email protected]>
 

postgres-14-image/Dockerfile

@@ -16,8 +16,10 @@
 
 #!BuildTag: opensuse/postgres:14
 #!BuildTag: opensuse/postgres:14-%RELEASE%
-#!BuildTag: opensuse/postgres:%%pg_version%%
-#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server findutil
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 14"
 LABEL org.opencontainers.image.description="PostgreSQL 14 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="14"
+LABEL org.opencontainers.image.version="%%pg_patch_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
@@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-14-image/README.md"
 ENV LANG="en_US.utf8"
 ENV PG_MAJOR="14"
-ENV PG_VERSION="%%pg_version%%"
+ENV PG_VERSION="%%pg_minor_version%%"
 ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

postgres-14-image/_service

@@ -3,8 +3,13 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_version%%</param>
+    <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql14-server</param>
     <param name="parse-version">minor</param>
   </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%pg_patch_version%%</param>
+    <param name="package">postgresql14-server</param>
+  </service>
 </services>

postgres-14-image/postgres-14-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 07:25:11 UTC 2024 - Dirk Mueller <[email protected]>
+
+- set full version on labels and tags
+
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <[email protected]>
 

postgres-15-image/Dockerfile

@@ -16,8 +16,10 @@
 
 #!BuildTag: opensuse/postgres:15
 #!BuildTag: opensuse/postgres:15-%RELEASE%
-#!BuildTag: opensuse/postgres:%%pg_version%%
-#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%
+#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%
+#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server findutil
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 15"
 LABEL org.opencontainers.image.description="PostgreSQL 15 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="15"
+LABEL org.opencontainers.image.version="%%pg_patch_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
@@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-15-image/README.md"
 ENV LANG="en_US.utf8"
 ENV PG_MAJOR="15"
-ENV PG_VERSION="%%pg_version%%"
+ENV PG_VERSION="%%pg_minor_version%%"
 ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

postgres-15-image/_service

@@ -3,8 +3,13 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_version%%</param>
+    <param name="regex">%%pg_minor_version%%</param>
     <param name="package">postgresql15-server</param>
     <param name="parse-version">minor</param>
   </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%pg_patch_version%%</param>
+    <param name="package">postgresql15-server</param>
+  </service>
 </services>

postgres-15-image/postgres-15-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 07:25:11 UTC 2024 - Dirk Mueller <[email protected]>
+
+- set full version on labels and tags
+
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <[email protected]>