2 Commits

5 changed files with 47 additions and 13 deletions

View File

@@ -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\ rm -Rf /var/log/mysqld* \n\
\n\ \n\
echo "CREATE USER `root`@`${MARIADB_ROOT_HOST}` IDENTIFIED BY `${MARIADB_ROOT_PASSWORD}`; \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 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 PROXY ON ``@`%` TO `root`@`${MARIADB_ROOT_HOST}` WITH GRANT OPTION;" >>/tmp/post.sql \n\
\n\ \n\
if [[ -n "${MARIADB_DATABASE}" ]] \n\ if [[ -n "${MARIADB_DATABASE}" ]] \n\
then \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 \ && echo -e "${MYSQLD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/mysqld \
&& chmod a+x /etc/init.d/mysqld \ && chmod a+x /etc/init.d/mysqld \
&& ln -s /etc/init.d/mysqld /etc/rcD.d/S30mysqld \ && ln -s /etc/init.d/mysqld /etc/rcD.d/S30mysqld \

View File

@@ -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. This is project aims to build a MariaDB + Mageia 9 docker image used by others Rx3 packaging projects.
Features: Features:
- Curtently based on rx3-docker/server:1.2.0-mga9 image, - Curtently based on rx3-docker/server:1.2.2-mga9 image,
- Following env vars supported: - Following env vars supported:
- MARIADB_UID & MARIADB_GID, - MARIADB_UID & MARIADB_GID,
- MARIADB_ROOT_HOST & MARIADB_ROOT_PASSWORD, - MARIADB_ROOT_HOST & MARIADB_ROOT_PASSWORD,

View File

@@ -1,3 +1,19 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.1-mga9 image.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB-Mga9 V 1.1.0 - A. GIBERT - 2024/11/17 Rx3-Docker/MariaDB-Mga9 V 1.1.0 - A. GIBERT - 2024/11/17
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

View File

@@ -6,8 +6,8 @@ name: ${DATABASE_IMG_NAME}
services: services:
database: database:
container_name: ${DATABASE_HOST_NAME} container_name: ${DATABASE_IMG_NAME}
hostname: ${DATABASE_HOST_NAME} hostname: ${DATABASE_IMG_NAME}
image: ${DATABASE_IMG_URL} image: ${DATABASE_IMG_URL}
@@ -23,7 +23,7 @@ services:
MARIADDB_LIB: ${DATABASE_LIB_INT} MARIADDB_LIB: ${DATABASE_LIB_INT}
MARIADDB_LOG: ${DATABASE_LOG_MAIN_INT} MARIADDB_LOG: ${DATABASE_LOG_MAIN_INT}
MARIADDB_PORT: ${DATABASE_PORT_MAIN_INT} MARIADDB_PORT: ${DATABASE_PORT_MAIN_INT}
POSTSQL_LOG: ${DATABASE_LOG_POST_INT} POSTSQL_LOG: ${DATABASE_LOG_INIT_INT}
restart: unless-stopped restart: unless-stopped

View File

@@ -9,7 +9,6 @@ ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000" ORG_REGISTRY="docker.xor.rx3:5000"
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@@ -21,20 +20,38 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
HOST_NAME_PREFIX="" HOST_NAME_PREFIX=""
PORT_ENV_OFFSET=0 PORT_ENV_OFFSET=0
PORT_SV_INT=9001
PORT_SV_OFFSET=1000 PORT_SV_OFFSET=1000
NETWORK_NAME=${HOST_NAME_PREFIX}
NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ DOCKER_TOOLS_DEBUG=FALSE
# | Variable | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
# | Prefix | URL Prefix | Name | Name Full + Version | URL Prefix | Name + Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
docker_service_add DATABASE ${ORG_URL_PREFIX} mariadb "Rx3-Docker/MariaDB Docker Image" 1.1.0-mga9 ${ORG_URL_PREFIX} server 1.2.0-mga9 mysql - 8006 3306 - - 983 981 DOCKER_TOOLS_VOLUME=SINGLE
#DOCKER_TOOLS_VOLUME=MIXED
#DOCKER_TOOLS_VOLUME=MERGED
#DOCKER_TOOLS_VOLUME=SPLIT
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
# | 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.2-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 mysql - 8006 3306 - - 983 981
#-------------------------------------------------------------------------------
# Database
#-------------------------------------------------------------------------------
MARIADB_ROOT_HOST='%' # needs to be enclosed with quotes MARIADB_ROOT_HOST='%' # needs to be enclosed with quotes
MARIADB_ROOT_PASSWORD="mysqladmin" MARIADB_ROOT_PASSWORD="mysqladmin"
MARIADB_DATABASE="test" MARIADB_DATABASE="test"
MARIADB_USER="test" MARIADB_USER="test"
MARIADB_PASSWORD="testadmin" MARIADB_PASSWORD="testadmin"