diff --git a/Dockerfile b/Dockerfile index fd361fc..8b91b6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ # You can contact the BCI team via https://github.com/SUSE/bci/discussions -#!BuildTag: opensuse/mariadb:%%mariadb_version%% -#!BuildTag: opensuse/mariadb:%%mariadb_version%%-%RELEASE% +#!BuildTag: opensuse/mariadb:11.2 +#!BuildTag: opensuse/mariadb:11.2-%RELEASE% #!BuildTag: opensuse/mariadb:latest FROM opensuse/tumbleweed:latest @@ -26,13 +26,13 @@ MAINTAINER openSUSE (https://www.opensuse.org/) # labelprefix=org.opensuse.application.mariadb 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="%%mariadb_version%%" +LABEL org.opencontainers.image.version="11.2" 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 io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-image/README.md" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:%%mariadb_version%%-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.2-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" LABEL org.opensuse.release-stage="released" @@ -43,6 +43,9 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk t ENTRYPOINT ["docker-entrypoint.sh"] CMD ["mariadbd"] EXPOSE 3306 +# sanity check that the version from the tag is equal to the version that we expect +RUN set -euo pipefail; [[ $(rpm -q --qf "%{version}" mariadb-client | cut -d "." -f -2) = "11.2" ]] + RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d # docker-entrypoint from https://github.com/MariaDB/mariadb-docker.git diff --git a/README.md b/README.md index 0fc1269..7f9eb31 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,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:%%mariadb_version%% +$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.2 ``` or: ```ShellSession -$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:%%mariadb_version%% +$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.2 ``` ### Volumes @@ -31,7 +31,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:%%mariadb_version%% +$ 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.2 ``` 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/_service b/_service index 56d3759..1652e46 100644 --- a/_service +++ b/_service @@ -1,16 +1,4 @@ - - Dockerfile - %%mariadb_version%% - mariadb - minor - - - README.md - %%mariadb_version%% - mariadb - minor - \ No newline at end of file diff --git a/mariadb-image.changes b/mariadb-image.changes index 5590cee..82f0711 100644 --- a/mariadb-image.changes +++ b/mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 30 08:24:02 UTC 2024 - Dan Čermák + +- Fix version string in reference + ------------------------------------------------------------------- Tue May 21 07:34:23 UTC 2024 - Dan Čermák