Compare commits
No commits in common. "master" and "server-mga9-1.1.2" have entirely different histories.
master
...
server-mga
@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
|||||||
|
|
||||||
IMG_NAME="server-mga9"
|
IMG_NAME="server-mga9"
|
||||||
IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
|
IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
|
||||||
IMG_VERSION="1.1.3"
|
IMG_VERSION="1.1.2"
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
@ -26,10 +26,3 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
|||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# User Settings
|
# User Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
ENV_PORT_OFFSET=0
|
|
||||||
SV_PORT_OFFSET=1000
|
|
||||||
|
|
||||||
SERVER_PORT=$(( 8080 + ${ENV_PORT_OFFSET}))
|
|
||||||
SERVER_SV_PORT=$(( ${SERVER_PORT} + ${SV_PORT_OFFSET}))
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
ARG IMG_URL_PREFIX="rx3"
|
ARG IMG_URL_PREFIX="rx3"
|
||||||
|
|
||||||
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.6
|
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.4
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_FULL_NAME
|
||||||
|
@ -5,7 +5,7 @@ Welcome to Rx3/Server-Mga9 docker image!
|
|||||||
This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects.
|
This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3/base-mga9:1.2.6 image,
|
- Curtently based on rx3/base-mga9:1.2.4 image,
|
||||||
- Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
- Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
||||||
- supervisord managing services,
|
- supervisord managing services,
|
||||||
- crond & logrotate configured.
|
- crond & logrotate configured.
|
||||||
|
@ -1,13 +1,3 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
- Use now rx3/base-mga9:1.2.6 image,
|
|
||||||
- Variabilization of external server ports in env & compose file,
|
|
||||||
- Use now docker_tools for .env building.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28
|
Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -22,4 +22,4 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${SERVER_SV_PORT}:9001"
|
- "127.0.0.1:9010:9001"
|
||||||
|
Loading…
Reference in New Issue
Block a user