ubi: docker.conf first. tzdata -reinstall

MariaDB · May 23, 2024 · 0f02f49 · 0f02f49
1 parent 48ba15e
commit 0f02f49
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/10.11-ubi/Dockerfile b/10.11-ubi/Dockerfile
@@ -18,30 +18,33 @@ RUN curl --location --output /usr/local/bin/gosu https://github.com/tianon/gosu/
 	gosu --version; \
 	gosu nobody true
 
+COPY docker.cnf /etc/my.cnf.d/
+
 COPY MariaDB.repo /etc/yum.repos.d/
 
 # missing pwgen, pv (epel),
 # procps - missing dependency of galera sst script
 # libboost_program_options.so.1.66.0 only used by garb - should fix upstream
+# tzdata re-installed as only a fake verion is part of base image.
 RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys FF8AD1344597106ECE813B918A3872BF3228467C && \
 	rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
 	rpmkeys --import https://supplychain.mariadb.com/MariaDB-Server-GPG-KEY && \
 	microdnf update -y && \
-	microdnf install -y procps-ng zstd xz jemalloc pwgen tzdata && \
+	microdnf reinstall -y tzdata && \
+	microdnf install -y procps-ng zstd xz jemalloc pwgen && \
         for pkg in boost-program-options-1.75.0-8; do \
 		rpm -ivh https://repo.almalinux.org/almalinux/9/AppStream/$(arch)/os/Packages/${pkg}.el9.$(arch).rpm ; \
         done ; \
+	mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ && \
 	microdnf install -y MariaDB-backup-10.11.8 MariaDB-server-10.11.8 && \
 	ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so && \
-	microdnf clean all
+	microdnf clean all && \
 	rm -rf /var/lib/mysql; \
 	mkdir -p /var/lib/mysql /var/run/mysqld /etc/mysql/conf.d/ /etc/mysql/mariadb.conf.d/; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 	chmod 777 /var/run/mysqld ; \
 	mkdir  /licenses && ln -s /usr/share/doc/MariaDB-server-10.11.8/COPYING /licenses/GPL-2
 
-COPY docker.cnf /etc/my.cnf.d/
-
 VOLUME /var/lib/mysql
 
 RUN mkdir /docker-entrypoint-initdb.d

diff --git a/10.6-ubi/Dockerfile b/10.6-ubi/Dockerfile
@@ -18,30 +18,33 @@ RUN curl --location --output /usr/local/bin/gosu https://github.com/tianon/gosu/
 	gosu --version; \
 	gosu nobody true
 
+COPY docker.cnf /etc/my.cnf.d/
+
 COPY MariaDB.repo /etc/yum.repos.d/
 
 # missing pwgen, pv (epel),
 # procps - missing dependency of galera sst script
 # libboost_program_options.so.1.66.0 only used by garb - should fix upstream
+# tzdata re-installed as only a fake verion is part of base image.
 RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys FF8AD1344597106ECE813B918A3872BF3228467C && \
 	rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
 	rpmkeys --import https://supplychain.mariadb.com/MariaDB-Server-GPG-KEY && \
 	microdnf update -y && \
-	microdnf install -y procps-ng zstd xz jemalloc pwgen tzdata && \
+	microdnf reinstall -y tzdata && \
+	microdnf install -y procps-ng zstd xz jemalloc pwgen && \
         for pkg in boost-program-options-1.75.0-8; do \
 		rpm -ivh https://repo.almalinux.org/almalinux/9/AppStream/$(arch)/os/Packages/${pkg}.el9.$(arch).rpm ; \
         done ; \
+	mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ && \
 	microdnf install -y MariaDB-backup-10.6.18 MariaDB-server-10.6.18 && \
 	ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so && \
-	microdnf clean all
+	microdnf clean all && \
 	rm -rf /var/lib/mysql; \
 	mkdir -p /var/lib/mysql /var/run/mysqld /etc/mysql/conf.d/ /etc/mysql/mariadb.conf.d/; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 	chmod 777 /var/run/mysqld ; \
 	mkdir  /licenses && ln -s /usr/share/doc/MariaDB-server-10.6.18/COPYING /licenses/GPL-2
 
-COPY docker.cnf /etc/my.cnf.d/
-
 VOLUME /var/lib/mysql
 
 RUN mkdir /docker-entrypoint-initdb.d

diff --git a/Dockerfile-ubi.template b/Dockerfile-ubi.template
@@ -18,30 +18,33 @@ RUN curl --location --output /usr/local/bin/gosu https://github.com/tianon/gosu/
 	gosu --version; \
 	gosu nobody true
 
+COPY docker.cnf /etc/my.cnf.d/
+
 COPY MariaDB.repo /etc/yum.repos.d/
 
 # missing pwgen, pv (epel),
 # procps - missing dependency of galera sst script
 # libboost_program_options.so.1.66.0 only used by garb - should fix upstream
+# tzdata re-installed as only a fake verion is part of base image.
 RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys FF8AD1344597106ECE813B918A3872BF3228467C && \
 	rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
 	rpmkeys --import https://supplychain.mariadb.com/MariaDB-Server-GPG-KEY && \
 	microdnf update -y && \
-	microdnf install -y procps-ng zstd xz jemalloc pwgen tzdata && \
+	microdnf reinstall -y tzdata && \
+	microdnf install -y procps-ng zstd xz jemalloc pwgen && \
         for pkg in boost-program-options-1.75.0-8; do \
 		rpm -ivh https://repo.almalinux.org/almalinux/9/AppStream/$(arch)/os/Packages/${pkg}.el9.$(arch).rpm ; \
         done ; \
+	mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ && \
 	microdnf install -y MariaDB-backup-%%MARIADB_VERSION_BASIC%% MariaDB-server-%%MARIADB_VERSION_BASIC%% && \
 	ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so && \
-	microdnf clean all
+	microdnf clean all && \
 	rm -rf /var/lib/mysql; \
 	mkdir -p /var/lib/mysql /var/run/mysqld /etc/mysql/conf.d/ /etc/mysql/mariadb.conf.d/; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 	chmod 777 /var/run/mysqld ; \
 	mkdir  /licenses && ln -s /usr/share/doc/MariaDB-server-%%MARIADB_VERSION_BASIC%%/COPYING /licenses/GPL-2
 
-COPY docker.cnf /etc/my.cnf.d/
-
 VOLUME /var/lib/mysql
 
 RUN mkdir /docker-entrypoint-initdb.d