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

- Minor compose / dockerfile args & structure improvements.

Browse Source
This commit is contained in:
Arnaud G. GIBERT 2024-08-27 00:24:39 +02:00
parent bc3d6d4a76
commit df9a5ee2ec
4 changed files with 50 additions and 26 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="base-mga9" IMG_NAME="base-mga9"
IMG_NAME="Rx3 Base Mageia-9 Docker Image" IMG_FULL_NAME="Rx3 Base Mageia-9 Docker Image"
IMG_VERSION="1.2.2" IMG_VERSION="1.2.3"
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>'

42
Dockerfile
View File

@ -8,29 +8,45 @@ ARG LANGUAGE
ARG LOCALTIME ARG LOCALTIME
RUN echo -e "LANG=${LANG}\nLANGUAGE=${LANGUAGE}" >/etc/locale.conf \
&& ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \ #---------------------------------------------------------------------------------------------------
&& urpmi.removemedia -a \ ARG LOCALE_CONF="LANG=${LANG} \n\
&& urpmi.addmedia --distrib http://ftp.free.fr/mirrors/mageia.org/distrib/9/x86_64 \ LANGUAGE=${LANGUAGE}"
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG RX3_SH='export PAGER=less \n\
export MANPAGER="less -isr" \n\
export EDITOR=emacs \n\
alias ll="ls -la" \n\
alias em="emacs"'
#---------------------------------------------------------------------------------------------------
RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf \
&& ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \
&& urpmi.removemedia -a \
&& urpmi.addmedia --distrib http://ftp.free.fr/mirrors/mageia.org/distrib/9/x86_64 \
&& urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \ && urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \
&& urpmi.update -a \ && urpmi.update -a \
&& urpmi --force --replacepkgs glibc locales locales-en \ && urpmi --force --replacepkgs glibc locales locales-en \
&& urpmi --force --auto-update \ && urpmi --force --auto-update \
&& rm -f /var/log/dnf* /var/log/hawkey.log \ && rm -f /var/log/dnf* /var/log/hawkey.log \
&& echo -e "export PAGER=less\nexport MANPAGER='less -isr'\nexport EDITOR=emacs\nalias ll='ls -la'\nalias em='emacs'" >/etc/profile.d/rx3.sh && echo -e "${RX3_SH}" | sed -e 's/ *$//' >/etc/profile.d/rx3.sh
FROM scratch FROM scratch
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}

20
ReleaseNotes.txt
View File

@ -1,14 +1,22 @@
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Base-Mga9 V 1.2.2 - A. GIBERT - 2024/08/25 Rx3/Base-Mga9 V 1.2.3 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------
- Minor compose / dockerfile args & structure improvements.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Base-Mga9 V 1.2.2 - A. GIBERT - 2024/08/25
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Remove entrypoint now implemented by rx3/server-mga9 image, - Remove entrypoint now implemented by rx3/server-mga9 image,
- Minor compose / dockerfile args improvments. - Minor compose / dockerfile args improvements.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24 Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Add LANG, LANGUAGE & LOCALTIME build args, - Add LANG, LANGUAGE & LOCALTIME build args,
@ -17,7 +25,7 @@ Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22 Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Mono Layer release whith multi-stage building, - Mono Layer release whith multi-stage building,
@ -28,7 +36,7 @@ Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22 Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
----------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------
- Mono Layer release: manually merged by docker export + copy. - Mono Layer release: manually merged by docker export + copy.
@ -36,7 +44,7 @@ Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22 Rx3/Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Initial release, - Initial release,

6
compose.yaml
View File

@ -1,20 +1,20 @@
# Rx3 Base Mageia-9 Docker Image # Rx3 Base Mageia-9 Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_ID} name: ${IMG_NAME}
services: services:
default: default:
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}
- LANG=${LANG} - LANG=${LANG}