- Use now rx3-docker/server:1.2.1-mga9 image.

This commit is contained in:
Arnaud G. GIBERT 2025-03-08 18:06:53 +01:00
parent 03259cffdb
commit 27a7ac7a14
4 changed files with 32 additions and 10 deletions

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.
Features:
- Curtently based on rx3-docker/server:1.2.0-mga9 image,
- Curtently based on rx3-docker/server:1.2.1-mga9 image,
- Following env vars supported:
- MARIADB_UID & MARIADB_GID,
- MARIADB_ROOT_HOST & MARIADB_ROOT_PASSWORD,

View File

@ -1,3 +1,11 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------

View File

@ -6,8 +6,8 @@ name: ${DATABASE_IMG_NAME}
services:
database:
container_name: ${DATABASE_HOST_NAME}
hostname: ${DATABASE_HOST_NAME}
container_name: ${DATABASE_IMG_NAME}
hostname: ${DATABASE_IMG_NAME}
image: ${DATABASE_IMG_URL}
@ -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_POST_INT}
POSTSQL_LOG: ${DATABASE_LOG_POSTSQL_INT}
restart: unless-stopped

View File

@ -9,7 +9,6 @@ ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000"
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@ -21,20 +20,35 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
HOST_NAME_PREFIX=""
PORT_ENV_OFFSET=0
PORT_SV_INT=9001
PORT_SV_OFFSET=1000
NETWORK_NAME=${HOST_NAME_PREFIX}
NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
#------------------+----------+--------------------+--------------------------+------------------------------------------+------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | 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_TOOLS_DEBUG=FALSE
DOCKER_TOOLS_VOLUME=MIXED
#DOCKER_TOOLS_VOLUME=MERGED
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
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
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | 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.1-mga9 ${ORG_URL_PREFIX} server 1.2.1-mga9 mysql - 8006 3306 - - 983 981
#-------------------------------------------------------------------------------
# Database
#-------------------------------------------------------------------------------
MARIADB_ROOT_HOST='%' # needs to be enclosed with quotes
MARIADB_ROOT_PASSWORD="mysqladmin"
MARIADB_DATABASE="test"
MARIADB_USER="test"
MARIADB_PASSWORD="testadmin"
DATABASE_LOG_POSTSQL_INT=/var/log/init