diff --git a/Dockerfile b/Dockerfile index 8f69786..10418d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -17,7 +18,8 @@ LABEL maintainer=${IMG_MAINTAINER} -RUN urpmi.update -a \ +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) \ && rm -f /var/cache/urpmi/rpms/* diff --git a/ReadMe.txt b/ReadMe.txt index da897ac..0c318cd 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,11 +5,12 @@ 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.2.7-mga9 image, + - Curtently based on rx3-docker/server:1.3.0-mga9 image, - OpenJVM 17, - Striped down. + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 2773bc9..0af5442 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Java V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 5eef093..8568fb5 100644 --- a/compose.yaml +++ b/compose.yaml @@ -18,6 +18,7 @@ services: IMG_NAME_FULL: ${SRV_IMG_NAME_FULL} IMG_VERSION: ${SRV_IMG_VERSION} IMG_MAINTAINER: ${SRV_IMG_MAINTAINER} + IMG_URL: ${SRV_IMG_URL} IMG_FROM_URL: ${SRV_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index 2e2193f..0f6c2bd 100644 --- a/env.dist +++ b/env.dist @@ -41,7 +41,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 Docker Image" 1.1.4-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 - - 8014 8080 - - apache apache +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