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

🤖: Update build recipes for Tumbleweed
SUSE · Nov 18, 2024 · 070a8c5 · 070a8c5
2 parents d5da8f2 + b61e37e
commit 070a8c5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/mariadb-client-image/Dockerfile b/mariadb-client-image/Dockerfile
@@ -17,7 +17,7 @@
 
 #!BuildTag: opensuse/mariadb-client:%%mariadb_version%%-%RELEASE%
 #!BuildTag: opensuse/mariadb-client:%%mariadb_version%%
-#!BuildTag: opensuse/mariadb-client:11.5
+#!BuildTag: opensuse/mariadb-client:11.6
 #!BuildTag: opensuse/mariadb-client:latest
 
 FROM opensuse/tumbleweed:latest
@@ -45,4 +45,4 @@ LABEL org.opensuse.release-stage="released"
 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.5" ]
+RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.6" ]
diff --git a/mariadb-client-image/README.md b/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.5 mariadb -h $HOST_IP -u root -p
+$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.6 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.5 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
+$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.6 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
 ```
 
 ## Utilities

diff --git a/mariadb-client-image/mariadb-client-image.changes b/mariadb-client-image/mariadb-client-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 18 09:27:58 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- update to 11.6 mariadb
+
 -------------------------------------------------------------------
 Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile
@@ -17,7 +17,7 @@
 
 #!BuildTag: opensuse/mariadb:%%mariadb_version%%-%RELEASE%
 #!BuildTag: opensuse/mariadb:%%mariadb_version%%
-#!BuildTag: opensuse/mariadb:11.5
+#!BuildTag: opensuse/mariadb:11.6
 #!BuildTag: opensuse/mariadb:latest
 
 FROM opensuse/tumbleweed:latest
@@ -47,7 +47,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["mariadbd"]
 EXPOSE 3306/tcp
 # 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.5" ]
+RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.6" ]
 
 RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d
 

diff --git a/mariadb-image/README.md b/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.5
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.6
 ```
 
 or:
 
 ```ShellSession
-$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.5
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.6
 ```
 
 ### 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.5
+$ 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.6
 ```
 
 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.

diff --git a/mariadb-image/docker-entrypoint.sh b/mariadb-image/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.4.4-MariaDB"
+	echo -n "%%mariadb_version%%-MariaDB"
 }
 
 # initializes the database directory

diff --git a/mariadb-image/mariadb-image.changes b/mariadb-image/mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 18 09:27:58 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- update to 11.6 mariadb
+
 -------------------------------------------------------------------
 Tue Nov 12 15:34:21 UTC 2024 - SUSE Update Bot <[email protected]>