- Minor compose / dockerfile args & structure improvements.

This commit is contained in:
2024-08-27 00:24:39 +02:00
parent bc3d6d4a76
commit 74f9715077
4 changed files with 50 additions and 26 deletions

View File

@@ -8,29 +8,45 @@ ARG LANGUAGE
ARG LOCALTIME
RUN echo -e "LANG=${LANG}\nLANGUAGE=${LANGUAGE}" >/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 \
#---------------------------------------------------------------------------------------------------
ARG LOCALE_CONF="LANG=${LANG} \n\
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 -a \
&& urpmi --force --replacepkgs glibc locales locales-en \
&& urpmi --force --auto-update \
&& 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
&& urpmi.update -a \
&& urpmi --force --replacepkgs glibc locales locales-en \
&& urpmi --force --auto-update \
&& rm -f /var/log/dnf* /var/log/hawkey.log \
&& echo -e "${RX3_SH}" | sed -e 's/ *$//' >/etc/profile.d/rx3.sh
FROM scratch
ARG IMG_ID
ARG IMG_NAME
ARG IMG_FULL_NAME
ARG IMG_VERSION
ARG IMG_MAINTAINER
LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}