- Use now rx3-docker/server:1.2.2-mga9 image,

- Clean-up env.dist.
This commit is contained in:
2025-04-21 19:01:29 +02:00
parent 374d70017a
commit 41fccc2ac8
5 changed files with 50 additions and 34 deletions

View File

@@ -7,6 +7,7 @@
ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000"
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@@ -16,15 +17,31 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
# Image Settings
#-------------------------------------------------------------------------------
IMG_NAME="java"
IMG_NAME_FULL="Rx3-Docker/Java Docker Image"
IMG_VERSION="1.1.1-mga9"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
HOST_NAME_PREFIX=""
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
PORT_ENV_OFFSET=0
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
#-------------------------------------------------------------------------------
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"