From 58494e28dd61665c6a04c17048acb93cbec86e4b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 2 Aug 2024 17:52:10 +1000 Subject: [PATCH] ubi: Fix env variable for installation version fixing --- 10.11-ubi/Dockerfile | 4 ++-- 10.6-ubi/Dockerfile | 4 ++-- 11.4-ubi/Dockerfile | 4 ++-- 11.5-ubi/Dockerfile | 4 ++-- 11.6-ubi/Dockerfile | 12 ++++++------ Dockerfile-ubi.template | 4 ++-- main-ubi/Dockerfile | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/10.11-ubi/Dockerfile b/10.11-ubi/Dockerfile index d3c1315..72804c7 100644 --- a/10.11-ubi/Dockerfile +++ b/10.11-ubi/Dockerfile @@ -86,7 +86,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -95,7 +95,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/10.6-ubi/Dockerfile b/10.6-ubi/Dockerfile index 75d8a00..31e1afe 100644 --- a/10.6-ubi/Dockerfile +++ b/10.6-ubi/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -96,7 +96,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/11.4-ubi/Dockerfile b/11.4-ubi/Dockerfile index b6ea419..c73fb26 100644 --- a/11.4-ubi/Dockerfile +++ b/11.4-ubi/Dockerfile @@ -86,7 +86,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -95,7 +95,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/11.5-ubi/Dockerfile b/11.5-ubi/Dockerfile index 382b8d2..d16dbe0 100644 --- a/11.5-ubi/Dockerfile +++ b/11.5-ubi/Dockerfile @@ -86,7 +86,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -95,7 +95,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/11.6-ubi/Dockerfile b/11.6-ubi/Dockerfile index db8fd8d..8380f3c 100644 --- a/11.6-ubi/Dockerfile +++ b/11.6-ubi/Dockerfile @@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/ # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images LABEL name="MariaDB Server" \ vendor="MariaDB Community" \ - version="11.6.0" \ + version="11.6.0 Vector" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \ summary="MariaDB Database" \ description="MariaDB Database for relational SQL" @@ -50,13 +50,13 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ org.opencontainers.image.licenses="GPL-2.0" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.vendor="MariaDB Community" \ - org.opencontainers.image.version="11.6.0" \ + org.opencontainers.image.version="11.6.0 Vector" \ org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker" # bashbrew-architectures: amd64 arm64v8 ppc64le s390x -ARG MARIADB_VERSION=11.6.0 +ARG MARIADB_VERSION=11.6.0 Vector ENV MARIADB_VERSION=$MARIADB_VERSION -# release-status:Alpha +# release-status:Unknown # release-support-type:Unknown # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -86,7 +86,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -95,7 +95,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/Dockerfile-ubi.template b/Dockerfile-ubi.template index 22e8808..13d31f5 100644 --- a/Dockerfile-ubi.template +++ b/Dockerfile-ubi.template @@ -87,7 +87,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -96,7 +96,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu diff --git a/main-ubi/Dockerfile b/main-ubi/Dockerfile index 8a335c5..7be4e69 100644 --- a/main-ubi/Dockerfile +++ b/main-ubi/Dockerfile @@ -86,7 +86,7 @@ RUN set -eux ; \ microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \ chmod ugo+rwx,o+t /run/mariadb ; \ - microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -95,7 +95,7 @@ RUN set -eux ; \ rmdir /var/lib/mysql/mysql ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ mkdir /licenses ; \ - ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu