From 6edf23ed528bd6d90a50c01e61d6fa658e9f22e0 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Thu, 28 May 2026 16:55:24 +0200 Subject: [PATCH] - Now use rx3-docker/server:1.4.0-mga9 image, - Now use docker-tools-1.5.2, - Rebuild for updates. --- Dockerfile | 2 +- ReadMe.txt | 2 +- ReleaseNotes.txt | 22 ++++++++++++++++------ env.dist | 5 +++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 10418d6..c933180 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ LABEL maintainer=${IMG_MAINTAINER} -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \ && urpmi.update -a \ && 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) \ diff --git a/ReadMe.txt b/ReadMe.txt index 0c318cd..0e860ef 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Java docker image! This project aims to build a Java docker image used by other Rx3 packaging projects. Features: - - Curtently based on rx3-docker/server:1.3.0-mga9 image, + - Curtently based on rx3-docker/server:1.4.0-mga9 image, - OpenJVM 17, - Striped down. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0af5442..e62edaa 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Java V 1.2.0 - A. GIBERT - 2026/05/30 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/server:1.4.0-mga9 image, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Java V 1.1.5 - A. GIBERT - 2026/02/16 ------------------------------------------------------------------------------------------------------------------------------------ - Add ISL support, -- Use now rx3-docker/server:1.3.0-mga9 image, +- Now use rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. @@ -12,7 +22,7 @@ Rx3-Docker/Java V 1.1.5 - A. GIBERT - 2026/02/16 Rx3-Docker/Java V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.7-mga9 image, +- Now use rx3-docker/server:1.2.7-mga9 image, - Rebuild for updates. @@ -21,7 +31,7 @@ Rx3-Docker/Java V 1.1.4 - A. GIBERT - 2025/11/29 Rx3-Docker/Java V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.6-mga9 image, +- Now use rx3-docker/server:1.2.6-mga9 image, - Rebuild for updates. @@ -30,7 +40,7 @@ Rx3-Docker/Java V 1.1.3 - A. GIBERT - 2025/09/19 Rx3-Docker/Java V 1.1.2 - A. GIBERT - 2025/04/21 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.2-mga9 image, +- Now use rx3-docker/server:1.2.2-mga9 image, - Clean-up env.dist. @@ -39,7 +49,7 @@ Rx3-Docker/Java V 1.1.2 - A. GIBERT - 2025/04/21 Rx3-Docker/Java V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.1-mga9 image. +- Now use rx3-docker/server:1.2.1-mga9 image. @@ -50,7 +60,7 @@ 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, +- Now use rx3-docker/server:1.2.0-mga9 image, - Add /var/log/init & /var/log/supervisor volumes, - Strip down dependencies. diff --git a/env.dist b/env.dist index 0f6c2bd..0411bd7 100644 --- a/env.dist +++ b/env.dist @@ -17,6 +17,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" # Image Settings #------------------------------------------------------------------------------- +APPL_NAME="" HOST_NAME_PREFIX="" PORT_ENV_OFFSET=0 @@ -25,7 +26,7 @@ PORT_SV_INT=9001 PORT_SV_OFFSET=1000 NETWORK_NAME=${HOST_NAME_PREFIX} -NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} +#NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE @@ -41,7 +42,7 @@ DOCKER_TOOLS_VOLUME=SINGLE # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add SRV server ${ORG_URL_PREFIX} java "Rx3-Docker/Java" 1.1.5-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 - - 8014 8080 - - apache apache +docker_service_add SRV server ${ORG_URL_PREFIX} java "Rx3-Docker/Java" 1.2.0-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 - - 8014 8080 - - apache apache