From 45834cda81b4af5c2b83c333f148490e7f8fc95b Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 7 Oct 2024 13:59:18 +0200 Subject: [PATCH] - Now use rx3/server-mga9:1.1.3 image, - Variabilization of external server ports in env & compose file, - Now use docker_tools for .env building. --- Dockerfile | 2 +- ReadMe.txt | 2 +- ReleaseNotes.txt | 12 +++++++++++- compose.yaml | 2 +- .env => env | 6 +++++- 5 files changed, 19 insertions(+), 5 deletions(-) rename .env => env (85%) diff --git a/Dockerfile b/Dockerfile index 4339a4f..6e7c180 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMG_URL_PREFIX="rx3" -FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2 +FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3 ARG IMG_NAME ARG IMG_FULL_NAME diff --git a/ReadMe.txt b/ReadMe.txt index dc3f508..e4b1d3e 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/Java-Mga9 docker image! This is project aims to build a Java + Mageia 9 docker image used by others Rx3 packaging projects. Features: - - Curtently based on rx3/server-mga9:1.1.2 image, + - Curtently based on rx3/server-mga9:1.1.3 image, - OpenJVM 17. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 369d376..ad4a960 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Java-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3/server-mga9:1.1.3 image, +- Variabilization of external server ports in env & compose file, +- Now use docker_tools for .env building. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Java-Mga9 V 1.0.0 - A. GIBERT - 2024/08/28 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Use based on server-mga9:1.1.2 image, +- Based on rx3/server-mga9:1.1.2 image, - OpenJVM 17. diff --git a/compose.yaml b/compose.yaml index b7564d9..9ce9072 100644 --- a/compose.yaml +++ b/compose.yaml @@ -24,5 +24,5 @@ services: network_mode: bridge ports: - - "127.0.0.1:9014: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 2557688..794ef86 100644 --- a/.env +++ b/env @@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="java-mga9" IMG_FULL_NAME="Rx3 Java 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" ' @@ -27,4 +27,8 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' # User Settings #------------------------------------------------------------------------------- +ENV_PORT_OFFSET=0 +SV_PORT_OFFSET=1000 +SERVER_PORT=$(( 8014 + ${ENV_PORT_OFFSET})) +SERVER_SV_PORT=$(( ${SERVER_PORT} + ${SV_PORT_OFFSET}))