1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ubi: Fix env variable for installation version fixing

Browse Source
This commit is contained in:
Daniel Black 2024-08-02 17:52:10 +10:00
parent c6f49a502a
commit 58494e28dd
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
10.11-ubi/Dockerfile
View File

@ -86,7 +86,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -95,7 +95,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

4
10.6-ubi/Dockerfile
View File

@ -87,7 +87,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -96,7 +96,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

4
11.4-ubi/Dockerfile
View File

@ -86,7 +86,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -95,7 +95,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

4
11.5-ubi/Dockerfile
View File

@ -86,7 +86,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -95,7 +95,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

12
11.6-ubi/Dockerfile
View File

@ -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 # 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" \ LABEL name="MariaDB Server" \
vendor="MariaDB Community" \ vendor="MariaDB Community" \
version="11.6.0" \ version="11.6.0 Vector" \
release="Refer to Annotations org.opencontainers.image.{revision,source}" \ release="Refer to Annotations org.opencontainers.image.{revision,source}" \
summary="MariaDB Database" \ summary="MariaDB Database" \
description="MariaDB Database for relational SQL" 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.licenses="GPL-2.0" \
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \ org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
org.opencontainers.image.vendor="MariaDB Community" \ 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" org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
ARG MARIADB_VERSION=11.6.0 ARG MARIADB_VERSION=11.6.0 Vector
ENV MARIADB_VERSION=$MARIADB_VERSION ENV MARIADB_VERSION=$MARIADB_VERSION
# release-status:Alpha # release-status:Unknown
# release-support-type:Unknown # release-support-type:Unknown
# (https://downloads.mariadb.org/rest-api/mariadb/) # (https://downloads.mariadb.org/rest-api/mariadb/)
@ -86,7 +86,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -95,7 +95,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

4
Dockerfile-ubi.template
View File

@ -87,7 +87,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -96,7 +96,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu

4
main-ubi/Dockerfile
View File

@ -86,7 +86,7 @@ RUN set -eux ; \
microdnf install -y procps-ng zstd xz jemalloc pwgen pv ; \ 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 ; \ 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 ; \ 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 # compatibility with DEB Galera packaging
ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \ ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
# compatibility with RPM Galera packaging # compatibility with RPM Galera packaging
@ -95,7 +95,7 @@ RUN set -eux ; \
rmdir /var/lib/mysql/mysql ; \ rmdir /var/lib/mysql/mysql ; \
chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \ chown -R mysql:mysql /var/lib/mysql /run/mariadb ; \
mkdir /licenses ; \ 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 /usr/share/licenses /licenses/package-licenses ; \
ln -s Apache-2.0-license /licenses/gosu ln -s Apache-2.0-license /licenses/gosu