- Use now rx3-docker/server:1.2.2-mga9 image,
- Clean-up env.dist.
This commit is contained in:
parent
374d70017a
commit
41fccc2ac8
@ -17,8 +17,9 @@ LABEL maintainer=${IMG_MAINTAINER}
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi --force --no-install java-17-openjdk-headless lib64rocm-opencl-runtime5.7 \
|
RUN urpmi.update -a \
|
||||||
&& 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) \
|
&& urpmi --force --no-install java-17-openjdk-headless lib64rocm-opencl-runtime5.7 \
|
||||||
&& rm -f /var/cache/urpmi/rpms/*
|
&& 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/*
|
||||||
|
|
||||||
|
|
||||||
|
@ -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.
|
This project aims to build a Java docker image used by other Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/server:1.2.1-mga9 image,
|
- Curtently based on rx3-docker/server:1.2.2-mga9 image,
|
||||||
- OpenJVM 17,
|
- OpenJVM 17,
|
||||||
- Striped down.
|
- Striped down.
|
||||||
|
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Java V 1.1.2 - A. GIBERT - 2025/04/21
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/server:1.2.2-mga9 image,
|
||||||
|
- Clean-up env.dist.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Java V 1.1.1 - A. GIBERT - 2025/03/08
|
Rx3-Docker/Java V 1.1.1 - A. GIBERT - 2025/03/08
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
24
compose.yaml
24
compose.yaml
@ -1,30 +1,30 @@
|
|||||||
# Rx3-Docker/Java Docker Image
|
# Rx3-Docker/Java Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
name: ${IMG_NAME}
|
name: ${SRV_IMG_NAME}
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
server:
|
server:
|
||||||
container_name: ${IMG_NAME}
|
container_name: ${SRV_IMG_NAME}
|
||||||
hostname: ${IMG_NAME}
|
hostname: ${SRV_IMG_NAME}
|
||||||
|
|
||||||
image: ${IMG_URL}
|
image: ${SRV_IMG_URL}
|
||||||
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
IMG_NAME: ${IMG_NAME}
|
IMG_NAME: ${SRV_IMG_NAME}
|
||||||
IMG_NAME_FULL: ${IMG_NAME_FULL}
|
IMG_NAME_FULL: ${SRV_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${IMG_VERSION}
|
IMG_VERSION: ${SRV_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${IMG_MAINTAINER}
|
IMG_MAINTAINER: ${SRV_IMG_MAINTAINER}
|
||||||
IMG_FROM_URL: ${IMG_FROM_URL}
|
IMG_FROM_URL: ${SRV_IMG_FROM_URL}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./var/log/init:${SERVER_LOG_INIT_DIR}
|
- ./${SRV_LOG_INIT_EXT}:${SRV_LOG_INIT_INT}
|
||||||
- ./var/log/supervisor:${SERVER_LOG_SV_DIR}
|
- ./${SRV_LOG_SV_EXT}:${SRV_LOG_SV_INT}
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}"
|
- "127.0.0.1:${SRV_PORT_SV_EXT}:${SRV_PORT_SV_INT}"
|
||||||
|
42
env.dist
42
env.dist
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
ORG_NAME="rx3-docker"
|
ORG_NAME="rx3-docker"
|
||||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||||
|
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||||
|
|
||||||
@ -16,15 +17,31 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
|||||||
# Image Settings
|
# Image Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
IMG_NAME="java"
|
HOST_NAME_PREFIX=""
|
||||||
IMG_NAME_FULL="Rx3-Docker/Java Docker Image"
|
|
||||||
IMG_VERSION="1.1.1-mga9"
|
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
|
||||||
|
|
||||||
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
|
PORT_ENV_OFFSET=0
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
|
||||||
|
|
||||||
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9"
|
PORT_SV_INT=9001
|
||||||
|
PORT_SV_OFFSET=1000
|
||||||
|
|
||||||
|
NETWORK_NAME=${HOST_NAME_PREFIX}
|
||||||
|
NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
|
||||||
|
|
||||||
|
DOCKER_TOOLS_DEBUG=FALSE
|
||||||
|
|
||||||
|
DOCKER_TOOLS_VOLUME=SINGLE
|
||||||
|
#DOCKER_TOOLS_VOLUME=MIXED
|
||||||
|
#DOCKER_TOOLS_VOLUME=MERGED
|
||||||
|
#DOCKER_TOOLS_VOLUME=SPLIT
|
||||||
|
|
||||||
|
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
|
||||||
|
|
||||||
|
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||||
|
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
|
||||||
|
# | 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.2-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - 8014 8080 - - apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -32,15 +49,4 @@ IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9"
|
|||||||
# User Settings
|
# User Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
ENV_PORT_OFFSET=0
|
|
||||||
SV_PORT_OFFSET=1000
|
|
||||||
|
|
||||||
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_LOG_INIT_DIR="/var/log/init"
|
|
||||||
SERVER_LOG_SV_DIR="/var/log/supervisor"
|
|
||||||
|
|
||||||
SERVER_CROND_ENABLED="FALSE"
|
SERVER_CROND_ENABLED="FALSE"
|
||||||
|
Loading…
Reference in New Issue
Block a user