diff --git a/Dockerfile b/Dockerfile index e3fdc42..66688af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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,8 @@ command=/usr/local/sbin/postsql' -RUN urpmi.update -a \ +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 \ @@ -114,10 +122,12 @@ RUN urpmi.update -a && echo -e "${POSTSQL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/postsql \ && chmod a+x /usr/local/sbin/postsql \ && echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini - + VOLUME ${MARIADDB_LIB} VOLUME ${MARIADDB_LOG} + + EXPOSE ${MARIADDB_PORT} diff --git a/ReadMe.txt b/ReadMe.txt index 9c6a578..d1b7a10 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.7-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. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6a74e67..a99858e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,15 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MariaDB-Mga9 V 1.1.4 - A. GIBERT - 2025/11/28 +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, @@ -8,7 +18,7 @@ Rx3-Docker/MariaDB-Mga9 V 1.1.4 - A. GIBERT - 2025/11/28 ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MariaDB-Mga9 V 1.1.3 - A. GIBERT - 2025/09/19 +Rx3-Docker/MariaDB V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ - Use now rx3-docker/server:1.2.6-mga9 image, @@ -17,7 +27,7 @@ Rx3-Docker/MariaDB-Mga9 V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MariaDB-Mga9 V 1.1.2 - A. GIBERT - 2025/03/21 +Rx3-Docker/MariaDB V 1.1.2 - A. GIBERT - 2025/03/21 ------------------------------------------------------------------------------------------------------------------------------------ - Use now rx3-docker/server:1.2.2-mga9 image. @@ -25,7 +35,7 @@ Rx3-Docker/MariaDB-Mga9 V 1.1.2 - A. GIBERT - 2025/03/21 ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MariaDB-Mga9 V 1.1.1 - A. GIBERT - 2025/03/08 +Rx3-Docker/MariaDB V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ - Use now rx3-docker/server:1.2.1-mga9 image. @@ -33,7 +43,7 @@ Rx3-Docker/MariaDB-Mga9 V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MariaDB-Mga9 V 1.1.0 - A. GIBERT - 2024/11/17 +Rx3-Docker/MariaDB V 1.1.0 - A. GIBERT - 2024/11/17 ------------------------------------------------------------------------------------------------------------------------------------ - Move & Rename repo from Rx3/MariaDB-MGA9 to Rx3-Docker/MariaDB, diff --git a/compose.yaml b/compose.yaml index 0e396de..49fdf88 100644 --- a/compose.yaml +++ b/compose.yaml @@ -18,6 +18,7 @@ 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} diff --git a/env.dist b/env.dist index 81b9b51..1c83e30 100644 --- a/env.dist +++ b/env.dist @@ -41,7 +41,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.4-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 mysql - 8006 3306 - - 983 981 +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