Rx3-Docker/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

- Minor compose / dockerfile args & structure improvements.

Browse Source
This commit is contained in:
Arnaud G. GIBERT 2024-08-27 00:33:11 +02:00
parent 74924d3de0
commit 69d96f7dda
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env
View File

@ -15,10 +15,10 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
# Image Settings # Image Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_ID="server-mga9" IMG_NAME="server-mga9"
IMG_NAME="Rx3 Server Mageia-9 Docker Image" IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
IMG_VERSION="1.1.0" IMG_VERSION="1.1.1"
IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${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>'

10
Dockerfile
View File

@ -5,14 +5,14 @@ ARG IMG_URL_PREFIX="rx3"
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2 FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2
ARG IMG_ID
ARG IMG_NAME ARG IMG_NAME
ARG IMG_FULL_NAME
ARG IMG_VERSION ARG IMG_VERSION
ARG IMG_MAINTAINER ARG IMG_MAINTAINER
LABEL org.rx3.${IMG_ID}.name=${IMG_NAME} LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER}
@ -70,7 +70,7 @@ RUN urpmi --force supervisor
&& mkdir /etc/rc.d/rcD.d \ && mkdir /etc/rc.d/rcD.d \
&& ln -s /etc/rc.d/rcD.d /etc \ && ln -s /etc/rc.d/rcD.d /etc \
&& echo -e "${SUPERVISORD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/supervisord.ini \ && echo -e "${SUPERVISORD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/supervisord.ini \
&& echo -e "${CROND_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini \ && echo -e "${CROND_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini \
&& echo -e "${SUPERVISORD}" | sed -e 's/ *$//' > /etc/init.d/supervisord \ && echo -e "${SUPERVISORD}" | sed -e 's/ *$//' > /etc/init.d/supervisord \
&& chmod a+x /etc/init.d/supervisord \ && chmod a+x /etc/init.d/supervisord \
&& ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord && ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord

8
ReleaseNotes.txt
View File

@ -1,3 +1,11 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Server-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Minor compose / dockerfile args & structure improvements.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26 Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

6
compose.yaml
View File

@ -1,20 +1,20 @@
# Rx3 Server Mageia-9 Docker Image # Rx3 Server Mageia-9 Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_ID} name: ${IMG_NAME}
services: services:
server: server:
container_name: ${IMG_ID} container_name: ${IMG_NAME}
image: ${IMG_URL} image: ${IMG_URL}
build: build:
context: . context: .
args: args:
- IMG_ID=${IMG_ID}
- IMG_NAME=${IMG_NAME} - IMG_NAME=${IMG_NAME}
- IMG_FULL_NAME=${IMG_FULL_NAME}
- IMG_VERSION=${IMG_VERSION} - IMG_VERSION=${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER} - IMG_MAINTAINER=${IMG_MAINTAINER}
- IMG_URL_PREFIX=${IMG_URL_PREFIX} - IMG_URL_PREFIX=${IMG_URL_PREFIX}