5 Commits

Author SHA1 Message Date
3fe82e435f - Add ISL support,
- Use now rx3-docker/server:1.3.0-mga9 image,
- Rebuild for updates.
2026-02-16 08:53:19 +01:00
ac23805099 - Use now rx3-docker/server:1.2.7-mga9 image,
- Rebuild for updates.
2025-11-28 20:20:01 +01:00
ad6bd1018e - Use now rx3-docker/server:1.2.6-mga9 image,
- Rebuild for updates.
2025-09-19 21:12:37 +02:00
4d33d2b89f - Use now rx3-docker/server:1.2.2-mga9 image. 2025-04-21 18:13:48 +02:00
27a7ac7a14 - Use now rx3-docker/server:1.2.1-mga9 image. 2025-03-08 18:06:53 +01:00
5 changed files with 89 additions and 15 deletions

View File

@@ -9,6 +9,7 @@ ARG IMG_NAME
ARG IMG_NAME_FULL
ARG IMG_VERSION
ARG IMG_MAINTAINER
ARG IMG_URL
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
@@ -62,11 +63,15 @@ fi
/usr/sbin/mysqld-prepare-db-dir'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG MYSQLD_INI='[program:mysqld] \n\
command=/usr/sbin/mysqld'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG POSTSQL='#!/bin/bash \n\
\n\
@@ -98,6 +103,8 @@ fi
log "Completed"'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG POSTSQL_INI='[program:postsql] \n\
command=/usr/local/sbin/postsql'
@@ -105,7 +112,9 @@ command=/usr/local/sbin/postsql'
RUN urpmi --force mariadb \
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
&& 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 \
@@ -119,4 +128,6 @@ RUN urpmi --force mariadb
VOLUME ${MARIADDB_LIB}
VOLUME ${MARIADDB_LOG}
EXPOSE ${MARIADDB_PORT}

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 mariadb 11.4.9 & rx3-docker/server:1.3.0-mga9 image,
- Following env vars supported:
- MARIADB_UID & MARIADB_GID,
- MARIADB_ROOT_HOST & MARIADB_ROOT_PASSWORD,
@@ -13,6 +13,7 @@ Features:
- MARIADB_USER & MARIADB_PASSWORD.
Enjoy it!
Your Rx3 Team.

View File

@@ -1,5 +1,49 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB-Mga9 V 1.1.0 - A. GIBERT - 2024/11/17
Rx3-Docker/MariaDB V 1.1.5 - A. GIBERT - 2026/02/16
------------------------------------------------------------------------------------------------------------------------------------
- Add ISL support,
- Use now rx3-docker/server:1.3.0-mga9 image,
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB V 1.1.4 - A. GIBERT - 2025/11/28
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.7-mga9 image,
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB V 1.1.3 - A. GIBERT - 2025/09/19
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.6-mga9 image,
- Rebuild for updates.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB V 1.1.2 - A. GIBERT - 2025/03/21
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.2-mga9 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB V 1.1.1 - A. GIBERT - 2025/03/08
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.1-mga9 image.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/MariaDB V 1.1.0 - A. GIBERT - 2024/11/17
------------------------------------------------------------------------------------------------------------------------------------
- Move & Rename repo from Rx3/MariaDB-MGA9 to Rx3-Docker/MariaDB,

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}
@@ -18,12 +18,13 @@ services:
IMG_NAME_FULL: ${DATABASE_IMG_NAME_FULL}
IMG_VERSION: ${DATABASE_IMG_VERSION}
IMG_MAINTAINER: ${DATABASE_IMG_MAINTAINER}
IMG_URL: ${DATABASE_IMG_URL}
IMG_FROM_URL: ${DATABASE_IMG_FROM_URL}
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_INIT_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,38 @@ 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_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.5-mga9 ${ORG_URL_PREFIX} server 1.3.0-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"