- Move & Rename repo from Rx3/MariaDB-MGA9 to Rx3-Docker/MariaDB,

- New version naming standard,
- Now use docker_tools for .env building,
- Now use docker_service_add macro,
- Use now rx3-docker/server:1.2.0-mga9 image,
- Add /var/log/init, /var/log/supervisor & var/log/mysql volumes.
This commit is contained in:
2024-11-17 13:57:44 +01:00
parent 1c23ba75b8
commit 03259cffdb
10 changed files with 126 additions and 83 deletions

View File

@@ -1,20 +1,28 @@
# Rx3 MariaDB Mageia-9 Docker Image
# Rx3-Docker/MariaDB Docker Image
#-------------------------------------------------------------------------------
ARG IMG_URL_PREFIX="rx3"
ARG IMG_FROM_URL="rx3-docker/server:latest"
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
FROM ${IMG_FROM_URL}
ARG IMG_NAME
ARG IMG_FULL_NAME
ARG IMG_NAME_FULL
ARG IMG_VERSION
ARG IMG_MAINTAINER
LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}
ARG MARIADDB_LIB
ARG MARIADDB_LOG
ARG MARIADDB_PORT
ARG POSTSQL_LOG
ARG MARIADB_LOG_FILE="${MARIADDB_LOG}/mariadb.err"
ARG POSTSQL_LOG_FILE="${POSTSQL_LOG}/postsql.log"
#---------------------------------------------------------------------------------------------------
@@ -23,11 +31,14 @@ ARG MYSQLD='#!/bin/bash
usermod -u ${MARIADB_UID} mysql \n\
groupmod -g ${MARIADB_GID} mysql \n\
\n\
chown -R mysql:mysql /var/lib/mysql /var/log/mysqld /var/run/mysqld \n\
chown -R mysql:mysql '${MARIADDB_LIB}' '${MARIADDB_LOG}' /var/run/mysqld \n\
\n\
sed -i -e "s/^skip-networking/#skip-networking/" /etc/my.cnf.d/server.cnf \n\
sed -i -e "s/^skip-networking/#skip-networking/" /etc/my.cnf.d/server.cnf \n\
sed -i -e "s%hostname$%hostname\\n\\nlog_error='${MARIADB_LOG_FILE}'%" /etc/my.cnf.d/server.cnf \n\
sed -i -e "s/^plugin-load-add=/#plugin-load-add=/" /etc/my.cnf.d/cracklib_password_check.cnf \n\
\n\
rm -Rf /var/log/mysqld* \n\
\n\
echo "CREATE USER `root`@`${MARIADB_ROOT_HOST}` IDENTIFIED BY `${MARIADB_ROOT_PASSWORD}`; \n\
GRANT ALL ON *.* TO `root`@`${MARIADB_ROOT_HOST}` WITH GRANT OPTION; \n\
GRANT PROXY ON ``@`%` TO `root`@`${MARIADB_ROOT_HOST}` WITH GRANT OPTION;" >>/tmp/post.sql \n\
@@ -59,7 +70,7 @@ command=/usr/sbin/mysqld'
#---------------------------------------------------------------------------------------------------
ARG POSTSQL='#!/bin/bash \n\
\n\
function log() { echo "$(date --rfc-3339=ns) PostSQL: $*" | tee -a /var/log/postsql.log; } \n\
function log() { echo "$(date --rfc-3339=ns) PostSQL: $*" | tee -a '${POSTSQL_LOG_FILE}'; } \n\
\n\
log "Starting" \n\
\n\
@@ -105,6 +116,7 @@ RUN urpmi --force mariadb
VOLUME /var/lib/mysql
VOLUME ${MARIADDB_LIB}
VOLUME ${MARIADDB_LOG}
EXPOSE 3306
EXPOSE ${MARIADDB_PORT}