From 05a42334c406567185dc331defd0f33b8edd0454 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 25 Jul 2024 12:35:36 +1000 Subject: [PATCH] ubi: use ENV MARIADB_VERSION so its easier for CI --- 10.11-ubi/Dockerfile | 5 +++-- 10.6-ubi/Dockerfile | 5 +++-- 11.4-ubi/Dockerfile | 5 +++-- 11.5-ubi/Dockerfile | 9 +++++---- 11.6-ubi/Dockerfile | 5 +++-- Dockerfile-ubi.template | 5 +++-- main-ubi/Dockerfile | 5 +++-- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/10.11-ubi/Dockerfile b/10.11-ubi/Dockerfile index 272ae5f..314351a 100644 --- a/10.11-ubi/Dockerfile +++ b/10.11-ubi/Dockerfile @@ -55,6 +55,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=10.11.8 +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -85,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-10.11.8 MariaDB-server-10.11.8 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -94,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-10.11.8/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/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 eaf6b17..d3f16a7 100644 --- a/10.6-ubi/Dockerfile +++ b/10.6-ubi/Dockerfile @@ -56,6 +56,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_MAJOR=10.6 ARG MARIADB_VERSION=10.6.18 +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -86,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-10.6.18 MariaDB-server-10.6.18 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # 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 +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-10.6.18/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/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 6ec1021..dce5d08 100644 --- a/11.4-ubi/Dockerfile +++ b/11.4-ubi/Dockerfile @@ -55,6 +55,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=11.4.2 +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Stable # release-support-type:Long Term Support # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -85,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-11.4.2 MariaDB-server-11.4.2 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -94,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-11.4.2/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/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 ffc3aeb..ccbe224 100644 --- a/11.5-ubi/Dockerfile +++ b/11.5-ubi/Dockerfile @@ -55,8 +55,9 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=11.5.1 -# release-status:RC -# release-support-type:Rolling +ENV MARIADB_VERSION=$MARIADB_VERSION +# release-status:Unknown +# release-support-type:Unknown # (https://downloads.mariadb.org/rest-api/mariadb/) # missing pwgen(epel), jemalloc(epel) (as entrypoint/user extensions) @@ -85,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-11.5.1 MariaDB-server-11.5.1 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -94,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-11.5.1/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/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 9e7182f..4ad4b31 100644 --- a/11.6-ubi/Dockerfile +++ b/11.6-ubi/Dockerfile @@ -55,6 +55,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=11.6.0 +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Alpha # release-support-type:Unknown # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -85,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-11.6.0 MariaDB-server-11.6.0 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -94,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-11.6.0/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/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 ab6e605..cff7d4d 100644 --- a/Dockerfile-ubi.template +++ b/Dockerfile-ubi.template @@ -56,6 +56,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures:%%ARCHES%% ARG MARIADB_MAJOR=%%MARIADB_MAJOR%% ARG MARIADB_VERSION=%%MARIADB_VERSION%% +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:%%MARIADB_RELEASE_STATUS%% # release-support-type:%%MARIADB_SUPPORT_TYPE%% # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -86,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_BASIC%% MariaDB-server-%%MARIADB_VERSION_BASIC%% ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # 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 +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_BASIC}/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 17d5189..a783921 100644 --- a/main-ubi/Dockerfile +++ b/main-ubi/Dockerfile @@ -55,6 +55,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \ # bashbrew-architectures: amd64 arm64v8 ppc64le s390x ARG MARIADB_VERSION=main.0 +ENV MARIADB_VERSION=$MARIADB_VERSION # release-status:Alpha # release-support-type:Unknown # (https://downloads.mariadb.org/rest-api/mariadb/) @@ -85,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-main.0 MariaDB-server-main.0 ; \ + microdnf install -y MariaDB-backup-${MARIADB_VERSION} MariaDB-server-${MARIADB_VERSION_BASIC} ; \ # compatibility with DEB Galera packaging ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ # compatibility with RPM Galera packaging @@ -94,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-main.0/COPYING /licenses/GPL-2 ; \ + ln -s /usr/share/doc/MariaDB-server-${MARIADB_VERSION_BASIC}/COPYING /licenses/GPL-2 ; \ ln -s /usr/share/licenses /licenses/package-licenses ; \ ln -s Apache-2.0-license /licenses/gosu