diff --git a/Dockerfile b/Dockerfile index 1316c0a..e3fdc42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,8 +40,8 @@ sed -i -e "s/^plugin-load-add=/#plugin-load-add=/" /etc/my.cnf.d/cracklib_passwo 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\ + 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\ \n\ if [[ -n "${MARIADB_DATABASE}" ]] \n\ then \n\ @@ -105,7 +105,8 @@ command=/usr/local/sbin/postsql' -RUN urpmi --force mariadb \ +RUN urpmi.update -a \ + && urpmi --force mariadb \ && echo -e "${MYSQLD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/mysqld \ && chmod a+x /etc/init.d/mysqld \ && ln -s /etc/init.d/mysqld /etc/rcD.d/S30mysqld \ diff --git a/ReadMe.txt b/ReadMe.txt index 240ef88..9d4b465 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/MariaDB docker image! This is project aims to build a MariaDB + Mageia 9 docker image used by others Rx3 packaging projects. Features: - - Curtently based on rx3-docker/server:1.2.1-mga9 image, + - Curtently based on rx3-docker/server:1.2.2-mga9 image, - Following env vars supported: - MARIADB_UID & MARIADB_GID, - MARIADB_ROOT_HOST & MARIADB_ROOT_PASSWORD, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 241b83e..c1bdb1a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MariaDB-Mga9 V 1.1.2 - A. GIBERT - 2025/03/21 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/server:1.2.2-mga9 image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MariaDB-Mga9 V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 638f579..0e396de 100644 --- a/compose.yaml +++ b/compose.yaml @@ -23,7 +23,7 @@ services: MARIADDB_LIB: ${DATABASE_LIB_INT} MARIADDB_LOG: ${DATABASE_LOG_MAIN_INT} MARIADDB_PORT: ${DATABASE_PORT_MAIN_INT} - POSTSQL_LOG: ${DATABASE_LOG_POSTSQL_INT} + POSTSQL_LOG: ${DATABASE_LOG_INIT_INT} restart: unless-stopped diff --git a/env.dist b/env.dist index 9774895..987891f 100644 --- a/env.dist +++ b/env.dist @@ -28,8 +28,12 @@ NETWORK_NAME=${HOST_NAME_PREFIX} NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE -DOCKER_TOOLS_VOLUME=MIXED + +DOCKER_TOOLS_VOLUME=SINGLE +#DOCKER_TOOLS_VOLUME=MIXED #DOCKER_TOOLS_VOLUME=MERGED +#DOCKER_TOOLS_VOLUME=SPLIT + #DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ @@ -37,7 +41,7 @@ DOCKER_TOOLS_VOLUME=MIXED # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add DATABASE database ${ORG_URL_PREFIX} mariadb "Rx3-Docker/MariaDB" 1.1.1-mga9 ${ORG_URL_PREFIX} server 1.2.1-mga9 mysql - 8006 3306 - - 983 981 +docker_service_add DATABASE database ${ORG_URL_PREFIX} mariadb "Rx3-Docker/MariaDB" 1.1.2-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 mysql - 8006 3306 - - 983 981 @@ -51,4 +55,3 @@ MARIADB_DATABASE="test" MARIADB_USER="test" MARIADB_PASSWORD="testadmin" -DATABASE_LOG_POSTSQL_INT=/var/log/init