- Minor compose / dockerfile args & structure improvements,

- Use now rx3/base-mga9:1.2.3 image.
This commit is contained in:
Arnaud G. GIBERT 2024-08-27 00:33:11 +02:00
parent 74924d3de0
commit 54c9fc477c
5 changed files with 23 additions and 14 deletions

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>'

View File

@ -3,16 +3,16 @@
ARG IMG_URL_PREFIX="rx3" ARG IMG_URL_PREFIX="rx3"
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2 FROM ${IMG_URL_PREFIX}/base-mga9:1.2.3
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}

View File

@ -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.2 image, - Curtently based on rx3/base-mga9:1.2.3 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.

View File

@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Server-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Minor compose / dockerfile args & structure improvements,
- Use now rx3/base-mga9:1.2.3 image.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26 Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

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}