From bad45dfe9f9223760b6f4c8dac3bcb1388932092 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 11 Nov 2024 19:25:48 +0100 Subject: [PATCH] - Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools, - New version naming standard, - Now use docker_tools for .env building, - Use now rx3-docker/server:1.2.0-mga9 image. --- Dockerfile | 26 +++++++++++++------------- ReadMe.txt | 10 +++++----- ReleaseNotes.txt | 11 +++++++++++ compose.yaml | 41 ++++++++++++++++++++--------------------- env => env.dist | 40 ++++++++++++++++++++++++---------------- 5 files changed, 73 insertions(+), 55 deletions(-) rename env => env.dist (56%) diff --git a/Dockerfile b/Dockerfile index 57a859d..ae186f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ -# Rx3 PHP Apache Mageia-9 Docker Image +# Rx3-Docker/Tools Docker Image #------------------------------------------------------------------------------- -ARG IMG_URL_PREFIX="rx3" +ARG IMG_FROM_URL="rx3-docker/php-apache:latest" -FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.3 +FROM ${IMG_FROM_URL} ARG IMG_NAME -ARG IMG_FULL_NAME +ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER ARG APACHE_DOC_ROOT -LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME} +LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER} @@ -33,12 +33,12 @@ sed -i "s/$conf\[`extra_login_security`\] = true;/$conf\[`extra_login_security`\ -RUN urpmi --force wget \ - && mkdir -p /var/www/appl \ - && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \ - && mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \ - && sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \ - && cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \ - && echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \ - && chmod a+x /etc/init.d/toolsd \ +RUN urpmi --force wget \ + && mkdir -p /var/www/appl \ + && wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \ + && mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \ + && sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \ + && cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \ + && echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \ + && chmod a+x /etc/init.d/toolsd \ && ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd diff --git a/ReadMe.txt b/ReadMe.txt index 1e35778..32ab7d1 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,12 +1,12 @@ -Welcome to Rx3/Tools-Mga9 docker image! +Welcome to Rx3-Docker/Tools docker image! -This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects. +This project aims to build a docker image embeding some usefull tools to tests other images from Rx3 packaging projects. Features: - - Curtently based on rx3/php-apache-mga9:1.3.3 image, - - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed, + - Curtently based on rx3-docker/php-apache:1.4.0-mga9 image, + - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/), - PostgreSQL server name, host & port configurable. @@ -16,4 +16,4 @@ Your Rx3 Team. -- arnaud@rx3.net -https://git.rx3.org/gitea/rx3/tools-mga9 +https://git.rx3.org/gitea/rx3-docker/tools diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index c00baff..47fe76b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,14 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Tools V 1.1.0 - A. GIBERT - 2024/11/11 +------------------------------------------------------------------------------------------------------------------------------------ + +- Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools, +- New version naming standard, +- Now use docker_tools for .env building, +- Use now rx3-docker/server:1.2.0-mga9 image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Tools-Mga9 V 1.0.2 - A. GIBERT - 2024/10/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index a058267..df6245d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,38 +1,37 @@ -# Rx3 Tools Mageia-9 Docker Image +# Rx3-Docker/Tools Docker Image #------------------------------------------------------------------------------- -name: ${IMG_NAME} +name: ${IMG_NAME} services: webtools: - container_name: ${IMG_NAME} + container_name: ${IMG_NAME} + hostname: ${IMG_NAME} - image: ${IMG_URL} + image: ${IMG_URL} build: context: . args: - - IMG_NAME=${IMG_NAME} - - IMG_FULL_NAME=${IMG_FULL_NAME} - - IMG_VERSION=${IMG_VERSION} - - IMG_MAINTAINER=${IMG_MAINTAINER} - - IMG_URL_PREFIX=${IMG_URL_PREFIX} - - APACHE_DOC_ROOT=${APACHE_DOC_ROOT} + IMG_NAME: ${IMG_NAME} + IMG_FULL_NAME: ${IMG_NAME_FULL} + IMG_VERSION: ${IMG_VERSION} + IMG_MAINTAINER: ${IMG_MAINTAINER} + IMG_FROM_URL: ${IMG_FROM_URL} + APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} restart: unless-stopped environment: - APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} - POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME} - POSTGRESQL_HOST: ${POSTGRESQL_HOST} - POSTGRESQL_PORT: ${POSTGRESQL_PORT} - MARIADB_SERVER_NAME: ${MARIADB_SERVER_NAME} - MARIADB_HOST: ${MARIADB_HOST} - MARIADB_PORT: ${MARIADB_PORT} - - network_mode: bridge + APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} + POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME} + POSTGRESQL_HOST: ${POSTGRESQL_HOST} + POSTGRESQL_PORT: ${POSTGRESQL_PORT} + MARIADB_SERVER_NAME: ${MARIADB_SERVER_NAME} + MARIADB_HOST: ${MARIADB_HOST} + MARIADB_PORT: ${MARIADB_PORT} ports: - - "127.0.0.1:${WEBAPP_SV_PORT}:9001" - - "127.0.0.1:${WEBAPP_PORT}:80" + - "127.0.0.1:${WEBTOOLS_PORT_SV_EXT}:${WEBTOOLS_PORT_SV_INT}" + - "127.0.0.1:${WEBTOOLS_PORT_MAIN_EXT}:${WEBTOOLS_PORT_MAIN_INT}" diff --git a/env b/env.dist similarity index 56% rename from env rename to env.dist index 044caac..92c377f 100644 --- a/env +++ b/env.dist @@ -1,13 +1,14 @@ -# Rx3 Tools Mageia-9 Docker Image +# Rx3-Docker/Tools Docker Image #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- # Global Settings #------------------------------------------------------------------------------- -IMG_ORG="rx3" -IMG_REGISTRY="docker.xor.rx3:5000" -IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" +ORG_NAME="rx3-docker" +ORG_REGISTRY="docker.xor.rx3:5000" + +ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" @@ -16,12 +17,16 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" #------------------------------------------------------------------------------- -IMG_NAME="tools-mga9" -IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image" -IMG_VERSION="1.0.2" -IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" +IMG_NAME="tools" +IMG_NAME_FULL="Rx3-Docker/Tools Docker Image" +IMG_VERSION="1.1.0-mga9" IMG_MAINTAINER='"Arnaud G. GIBERT" ' +IMG_URL_PREFIX="${ORG_URL_PREFIX}" +IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" + +IMG_FROM_URL="${ORG_URL_PREFIX}/php-apache:1.4.0-mga9" + #------------------------------------------------------------------------------- @@ -31,17 +36,20 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' ENV_PORT_OFFSET=0 SV_PORT_OFFSET=1000 -WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET})) -WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET})) +WEBTOOLS_PORT_MAIN_EXT=$(( 8070 + ${ENV_PORT_OFFSET})) +WEBTOOLS_PORT_MAIN_INT=80 + +WEBTOOLS_PORT_SV_EXT=$(( ${WEBTOOLS_PORT_MAIN_EXT} + ${SV_PORT_OFFSET})) +WEBTOOLS_PORT_SV_INT=9001 APACHE_UID=980 APACHE_GID=977 APACHE_DOC_ROOT=/var/www/html -POSTGRESQL_SERVER_NAME="" -POSTGRESQL_HOST="" -POSTGRESQL_PORT="" +POSTGRESQL_SERVER_NAME="Default" +POSTGRESQL_HOST="127.0.0.1" +POSTGRESQL_PORT="5342" -MARIADB_SERVER_NAME="" -MARIADB_HOST="" -MARIADB_PORT="" +MARIADB_SERVER_NAME="Default" +MARIADB_HOST="127.0.0.1" +MARIADB_PORT="3306"