Compare commits
4 Commits
mariadb-1.
...
mariadb-1.
| Author | SHA1 | Date | |
|---|---|---|---|
| 3fe82e435f | |||
| ac23805099 | |||
| ad6bd1018e | |||
| 4d33d2b89f |
17
Dockerfile
17
Dockerfile
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||||
@@ -40,8 +41,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\
|
||||||
@@ -62,11 +63,15 @@ fi
|
|||||||
/usr/sbin/mysqld-prepare-db-dir'
|
/usr/sbin/mysqld-prepare-db-dir'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
ARG MYSQLD_INI='[program:mysqld] \n\
|
ARG MYSQLD_INI='[program:mysqld] \n\
|
||||||
command=/usr/sbin/mysqld'
|
command=/usr/sbin/mysqld'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
ARG POSTSQL='#!/bin/bash \n\
|
ARG POSTSQL='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
@@ -98,6 +103,8 @@ fi
|
|||||||
log "Completed"'
|
log "Completed"'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
ARG POSTSQL_INI='[program:postsql] \n\
|
ARG POSTSQL_INI='[program:postsql] \n\
|
||||||
command=/usr/local/sbin/postsql'
|
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 \
|
&& 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 \
|
||||||
@@ -119,4 +128,6 @@ RUN urpmi --force mariadb
|
|||||||
VOLUME ${MARIADDB_LIB}
|
VOLUME ${MARIADDB_LIB}
|
||||||
VOLUME ${MARIADDB_LOG}
|
VOLUME ${MARIADDB_LOG}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
EXPOSE ${MARIADDB_PORT}
|
EXPOSE ${MARIADDB_PORT}
|
||||||
|
|||||||
@@ -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.1-mga9 image,
|
- Curtently based on mariadb 11.4.9 & rx3-docker/server:1.3.0-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,
|
||||||
@@ -13,6 +13,7 @@ Features:
|
|||||||
- MARIADB_USER & MARIADB_PASSWORD.
|
- MARIADB_USER & MARIADB_PASSWORD.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
|
||||||
Your Rx3 Team.
|
Your Rx3 Team.
|
||||||
|
|||||||
@@ -1,5 +1,41 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/MariaDB-Mga9 V 1.1.1 - A. GIBERT - 2025/03/08
|
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.
|
- Use now rx3-docker/server:1.2.1-mga9 image.
|
||||||
@@ -7,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,
|
- Move & Rename repo from Rx3/MariaDB-MGA9 to Rx3-Docker/MariaDB,
|
||||||
|
|||||||
@@ -18,12 +18,13 @@ services:
|
|||||||
IMG_NAME_FULL: ${DATABASE_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${DATABASE_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${DATABASE_IMG_VERSION}
|
IMG_VERSION: ${DATABASE_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${DATABASE_IMG_MAINTAINER}
|
IMG_MAINTAINER: ${DATABASE_IMG_MAINTAINER}
|
||||||
|
IMG_URL: ${DATABASE_IMG_URL}
|
||||||
IMG_FROM_URL: ${DATABASE_IMG_FROM_URL}
|
IMG_FROM_URL: ${DATABASE_IMG_FROM_URL}
|
||||||
|
|
||||||
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_POSTSQL_INT}
|
POSTSQL_LOG: ${DATABASE_LOG_INIT_INT}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
|||||||
9
env.dist
9
env.dist
@@ -28,8 +28,12 @@ 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
|
DOCKER_TOOLS_DEBUG=FALSE
|
||||||
DOCKER_TOOLS_VOLUME=MIXED
|
|
||||||
|
DOCKER_TOOLS_VOLUME=SINGLE
|
||||||
|
#DOCKER_TOOLS_VOLUME=MIXED
|
||||||
#DOCKER_TOOLS_VOLUME=MERGED
|
#DOCKER_TOOLS_VOLUME=MERGED
|
||||||
|
#DOCKER_TOOLS_VOLUME=SPLIT
|
||||||
|
|
||||||
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
|
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
|
||||||
|
|
||||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||||
@@ -37,7 +41,7 @@ DOCKER_TOOLS_VOLUME=MIXED
|
|||||||
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
|
# | 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
|
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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -51,4 +55,3 @@ MARIADB_DATABASE="test"
|
|||||||
MARIADB_USER="test"
|
MARIADB_USER="test"
|
||||||
MARIADB_PASSWORD="testadmin"
|
MARIADB_PASSWORD="testadmin"
|
||||||
|
|
||||||
DATABASE_LOG_POSTSQL_INT=/var/log/init
|
|
||||||
|
|||||||
Reference in New Issue
Block a user