From 023ba94c2346f199b6a82b6fd432f2b094046c31 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Thu, 28 May 2026 16:33:00 +0200 Subject: [PATCH] - Now use rx3-docker/server:1.4.0-mga9 image, - Now use docker-tools-1.5.2, - Rebuild for updates. --- Dockerfile | 2 +- ReadMe.txt | 2 +- ReleaseNotes.txt | 22 ++++++++++++++++------ env.dist | 6 ++++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5709ef4..e597f8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ command=/usr/local/sbin/postsql' -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +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 \ diff --git a/ReadMe.txt b/ReadMe.txt index aae40a7..3206470 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 mariadb 11.4.10 & rx3-docker/server:1.3.0-mga9 image, + - Curtently based on mariadb 11.4.10 & rx3-docker/server:1.4.0-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 0b51f8a..556d90b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/MariaDB V 1.2.0 - A. GIBERT - 2026/05/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/server:1.4.0-mga9 image, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/MariaDB V 1.1.6 - A. GIBERT - 2026/02/23 ------------------------------------------------------------------------------------------------------------------------------------ @@ -12,7 +22,7 @@ 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, +- Now use rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. @@ -21,7 +31,7 @@ Rx3-Docker/MariaDB V 1.1.5 - A. GIBERT - 2026/02/16 Rx3-Docker/MariaDB V 1.1.4 - A. GIBERT - 2025/11/28 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.7-mga9 image, +- Now use rx3-docker/server:1.2.7-mga9 image, - Rebuild for updates. @@ -30,7 +40,7 @@ Rx3-Docker/MariaDB V 1.1.4 - A. GIBERT - 2025/11/28 Rx3-Docker/MariaDB V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.6-mga9 image, +- Now use rx3-docker/server:1.2.6-mga9 image, - Rebuild for updates. @@ -39,7 +49,7 @@ Rx3-Docker/MariaDB V 1.1.3 - A. GIBERT - 2025/09/19 Rx3-Docker/MariaDB V 1.1.2 - A. GIBERT - 2025/03/21 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.2-mga9 image. +- Now use rx3-docker/server:1.2.2-mga9 image. @@ -47,7 +57,7 @@ Rx3-Docker/MariaDB V 1.1.2 - A. GIBERT - 2025/03/21 Rx3-Docker/MariaDB V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.1-mga9 image. +- Now use rx3-docker/server:1.2.1-mga9 image. @@ -59,7 +69,7 @@ Rx3-Docker/MariaDB V 1.1.0 - A. GIBERT - 2024/11/17 - 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, +- Now use rx3-docker/server:1.2.0-mga9 image, - Add /var/log/init, /var/log/supervisor & var/log/mysql volumes. diff --git a/env.dist b/env.dist index b7b219b..114f95d 100644 --- a/env.dist +++ b/env.dist @@ -17,6 +17,8 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" # Image Settings #------------------------------------------------------------------------------- + +APPL_NAME="" HOST_NAME_PREFIX="" PORT_ENV_OFFSET=0 @@ -25,7 +27,7 @@ PORT_SV_INT=9001 PORT_SV_OFFSET=1000 NETWORK_NAME=${HOST_NAME_PREFIX} -NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} +#NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE @@ -41,7 +43,7 @@ DOCKER_TOOLS_VOLUME=SINGLE # | 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.6-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 mysql - 8006 3306 - - 983 981 +docker_service_add DATABASE database ${ORG_URL_PREFIX} mariadb "Rx3-Docker/MariaDB" 1.2.0-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 mysql - 8006 3306 - - 983 981