diff --git a/Dockerfile b/Dockerfile index 0903d73..0708d18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMG_URL_PREFIX="rx3" -FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2 +FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.3 ARG IMG_NAME ARG IMG_FULL_NAME diff --git a/ReadMe.txt b/ReadMe.txt index f669468..1e35778 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/Tools-Mga9 docker image! This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects. Features: - - Curtently based on rx3/php-apache-mga9:1.3.2 image, + - Curtently based on rx3/php-apache-mga9:1.3.3 image, - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed, - PostgreSQL server name, host & port configurable. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bbbd1d0..7b9890f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Tools-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3/php-apache-mga9:1.3.3 image, +- Variabilization of external server ports in env & compose file, +- Now use docker_tools for .env building. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Tools-Mga9 V 1.0.0 - A. GIBERT - 2024/09/04 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Use based on rx3/php-apache-mga9:1.3.2 image, +- Based on rx3/php-apache-mga9:1.3.2 image, - PHPPGAdmin Installed. diff --git a/compose.yaml b/compose.yaml index 3424390..5f42a5b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,4 +1,4 @@ -# Rx3 PHP Apache Mageia-9 Docker Image +# Rx3 Tools Mageia-9 Docker Image #------------------------------------------------------------------------------- name: ${IMG_NAME} @@ -23,6 +23,7 @@ services: restart: unless-stopped environment: + APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME} POSTGRESQL_HOST: ${POSTGRESQL_HOST} POSTGRESQL_PORT: ${POSTGRESQL_PORT} @@ -33,5 +34,5 @@ services: network_mode: bridge ports: - - "127.0.0.1:9070:9001" - - "127.0.0.1:8070:80" + - "127.0.0.1:${WEBAPP_SV_PORT}:9001" + - "127.0.0.1:${WEBAPP_PORT}:80" diff --git a/.env b/env similarity index 87% rename from .env rename to env index 706dd0b..d7b5831 100644 --- a/.env +++ b/env @@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="tools-mga9" IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image" -IMG_VERSION="1.0.0" +IMG_VERSION="1.0.1" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' @@ -28,6 +28,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' # User Settings #------------------------------------------------------------------------------- +ENV_PORT_OFFSET=0 +SV_PORT_OFFSET=1000 + +WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET})) +WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET})) + APACHE_UID=980 APACHE_GID=977 APACHE_DOC_ROOT=/var/www/html