From eade80234ea99804cf99e37cab580bc9227dadf8 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Fri, 4 Oct 2024 15:38:29 +0200 Subject: [PATCH] - Use now rx3/base-mga9:1.2.6 image, - Variabilization of external server ports in env & compose file, - Use now docker_tools for .env building. --- Dockerfile | 2 +- ReadMe.txt | 2 +- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 2 +- .env => env | 9 ++++++++- 5 files changed, 21 insertions(+), 4 deletions(-) rename .env => env (85%) diff --git a/Dockerfile b/Dockerfile index 2d8531c..b22f6be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMG_URL_PREFIX="rx3" -FROM ${IMG_URL_PREFIX}/base-mga9:1.2.4 +FROM ${IMG_URL_PREFIX}/base-mga9:1.2.6 ARG IMG_NAME ARG IMG_FULL_NAME diff --git a/ReadMe.txt b/ReadMe.txt index 87a1712..2eab9ab 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/Server-Mga9 docker image! This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects. Features: - - Curtently based on rx3/base-mga9:1.2.4 image, + - Curtently based on rx3/base-mga9:1.2.6 image, - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d, - supervisord managing services, - crond & logrotate configured. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e9586bd..7cc512b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3/base-mga9:1.2.6 image, +- Variabilization of external server ports in env & compose file, +- Use now docker_tools for .env building. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 11c494a..3a53c96 100644 --- a/compose.yaml +++ b/compose.yaml @@ -22,4 +22,4 @@ services: restart: unless-stopped ports: - - "127.0.0.1:9010:9001" + - "127.0.0.1:${SERVER_SV_PORT}:9001" diff --git a/.env b/env similarity index 85% rename from .env rename to env index 2cd3e6f..49892f8 100644 --- a/.env +++ b/env @@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="server-mga9" IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image" -IMG_VERSION="1.1.2" +IMG_VERSION="1.1.3" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' @@ -26,3 +26,10 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' #------------------------------------------------------------------------------- # User Settings #------------------------------------------------------------------------------- + +ENV_PORT_OFFSET=0 +SV_PORT_OFFSET=1000 + +SERVER_PORT=$(( 8080 + ${ENV_PORT_OFFSET})) +SERVER_SV_PORT=$(( ${SERVER_PORT} + ${SV_PORT_OFFSET})) +