From 7a5478ca7acb4711b0f4d3f471fdf383988108de Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 11 Nov 2024 09:22:12 +0100 Subject: [PATCH] - Move & Rename repo from Rx3/Java-MGA9 to Rx3-Docker/Java, - New version naming standard, - Now use docker_tools for .env building, - Use now rx3-docker/server:1.2.0-mga9 image, - Strip down depencies. --- Dockerfile | 16 ++++++++++------ ReadMe.txt | 11 ++++++----- ReleaseNotes.txt | 12 ++++++++++++ compose.yaml | 22 ++++++++++------------ env => env.dist | 29 +++++++++++++++++++---------- 5 files changed, 57 insertions(+), 33 deletions(-) rename env => env.dist (61%) diff --git a/Dockerfile b/Dockerfile index 6e7c180..988ce06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,24 @@ -# Rx3 Java Mageia-9 Docker Image +# Rx3-Docker/Java Docker Image #------------------------------------------------------------------------------- -ARG IMG_URL_PREFIX="rx3" +ARG IMG_FROM_URL="rx3-docker/server:latest" -FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3 +FROM ${IMG_FROM_URL} ARG IMG_NAME -ARG IMG_FULL_NAME +ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER -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} -RUN urpmi --force java-17-openjdk-headless lib64rocm-opencl-runtime5.7 +RUN urpmi --force --no-install java-17-openjdk-headless lib64rocm-opencl-runtime5.7 \ +&& rpm -Uvh --nodeps $( for pkg in javapackages-filesystem java-17-openjdk-headless rootcerts-java timezone-java copy-jdk-configs; do ls /var/cache/urpmi/rpms/$pkg*.rpm; done) \ +&& rm -f /var/cache/urpmi/rpms/* + + diff --git a/ReadMe.txt b/ReadMe.txt index e4b1d3e..ee17469 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,12 +1,13 @@ -Welcome to Rx3/Java-Mga9 docker image! +Welcome to Rx3-Docker/Java docker image! -This is project aims to build a Java + Mageia 9 docker image used by others Rx3 packaging projects. +This project aims to build a Java + Mageia 9 docker image used by other Rx3 packaging projects. Features: - - Curtently based on rx3/server-mga9:1.1.3 image, - - OpenJVM 17. + - Curtently based on rx3-docker/server:1.2.0-mga9 image, + - OpenJVM 17, + - Striped down. Enjoy it! @@ -15,4 +16,4 @@ Your Rx3 Team. -- arnaud@rx3.net -https://git.rx3.org/gitea/rx3/java-mga9 +https://git.rx3.org/gitea/rx3-docker/java diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index ad4a960..024b808 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,15 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Java V 1.1.0 - A. GIBERT - 2024/11/11 +------------------------------------------------------------------------------------------------------------------------------------ + +- Move & Rename repo from Rx3/Java-MGA9 to Rx3-Docker/Java, +- New version naming standard, +- Now use docker_tools for .env building, +- Use now rx3-docker/server:1.2.0-mga9 image, +- Strip down dependencies. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Java-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 9ce9072..b6e6733 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,4 +1,4 @@ -# Rx3 PHP Apache Mageia-9 Docker Image +# Rx3-Docker/Java Docker Image #------------------------------------------------------------------------------- name: ${IMG_NAME} @@ -6,23 +6,21 @@ name: ${IMG_NAME} services: server: - 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}" + IMG_NAME: ${IMG_NAME} + IMG_FULL_NAME: ${IMG_NAME_FULL} + IMG_VERSION: ${IMG_VERSION} + IMG_MAINTAINER: ${IMG_MAINTAINER} + IMG_FROM_URL: ${IMG_FROM_URL} restart: unless-stopped - network_mode: bridge - ports: - - "127.0.0.1:${SERVER_SV_PORT}:9001" - + - "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}" diff --git a/env b/env.dist similarity index 61% rename from env rename to env.dist index 794ef86..dc74d87 100644 --- a/env +++ b/env.dist @@ -1,13 +1,14 @@ -# Rx3 Java Mageia-9 Docker Image +# Rx3-Docker/Java 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}" @@ -15,12 +16,16 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" # Image Settings #------------------------------------------------------------------------------- -IMG_NAME="java-mga9" -IMG_FULL_NAME="Rx3 Java Mageia-9 Docker Image" -IMG_VERSION="1.0.1" -IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" +IMG_NAME="java" +IMG_NAME_FULL="Rx3-Docker/Java 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}/server:1.2.0-mga9" + #------------------------------------------------------------------------------- @@ -30,5 +35,9 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' ENV_PORT_OFFSET=0 SV_PORT_OFFSET=1000 -SERVER_PORT=$(( 8014 + ${ENV_PORT_OFFSET})) -SERVER_SV_PORT=$(( ${SERVER_PORT} + ${SV_PORT_OFFSET})) +SERVER_PORT_MAIN_EXT=$(( 8014 + ${ENV_PORT_OFFSET})) + +SERVER_PORT_SV_EXT=$(( ${SERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET})) +SERVER_PORT_SV_INT=9001 + +SERVER_CROND_ENABLED="FALSE"