From 10cdc0eaefa175597af7e637d55e448f4fdf91c0 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 29 Mar 2026 19:11:17 +0200 Subject: [PATCH] - New custome made image building with mk_base_image! - Support new isl command, - Use now rx3-base 1.1.0 RPM, - Use now docker-tools-1.5.0. --- Dockerfile | 50 ++++++++++++++++++------------------------------ ReadMe.txt | 4 ++-- ReleaseNotes.txt | 11 +++++++++++ compose.yaml | 6 +++--- env.dist | 2 +- 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfe79c6..2983894 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,31 @@ # Rx3-Docker/Base Docker Image #------------------------------------------------------------------------------- -FROM mageia:9 +FROM mageia:9 AS builder ARG IMG_URL -ARG LANG -ARG LANGUAGE -ARG LOCALTIME +ARG IMG_LANG +ARG IMG_LANGUAGE +ARG IMG_LOCALTIME + +ARG URPMI_SETUP_URL="http://mirror.rx3.net/rx3/sbin/urpmi-setup-9" -#--------------------------------------------------------------------------------------------------- -ARG LOCALE_CONF="LANG=${LANG} \n\ -LANGUAGE=${LANGUAGE}" -#--------------------------------------------------------------------------------------------------- +#------------------------------------------------------------------------------------------------------------------------------- +# Build Stage +#------------------------------------------------------------------------------------------------------------------------------- + +RUN curl -L ${URPMI_SETUP_URL} | bash \ + && urpmi --force docker_tools-devel \ + && mk_base_image --verbose --direct --distrib 9 --lang ${IMG_LANG} --language ${IMG_LANGUAGE} --localtime ${IMG_LOCALTIME} \ + && chroot /var/tmp/base_root bash -lc "isl --add ${IMG_URL}" -ARG MIRRORLIST_MGA='http://mirror.xor.rx3/mageia/distrib/9/x86_64 https://mirror.rx3.net/mageia/distrib/9/x86_64 ftp://ftp.proxad.net/mirrors/mageia.org/distrib/9/x86_64 http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64' -ARG MIRRORLIST_RX3='http://mirror.xor.rx3/rx3/distrib/9/x86_64 https://mirror.rx3.net/rx3/distrib/9/x86_64' - - - -RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf \ - && ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \ - && urpmi.removemedia -a \ - && rm -f /var/cache/urpmi/mirrors.cache \ - && urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_MGA}" \ - && urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_RX3}" \ - && for arch in "" "32bit "; do for media in "Core" "Nonfree" "Tainted"; do for type in "Release" "Updates"; do urpmi.update --no-ignore "${media} ${arch}${type}"; done; done; done \ - && urpmi.update -a \ - && urpmi --force --replacepkgs glibc locales locales-en \ - && rpm -e $(rpm -qa | grep -e python -e dnf) gobject-introspection \ - && rpm -e lib64comps0 lib64gio2.0_0 lib64girepository1.0_1 lib64glib-gir2.0 lib64gpgme11 lib64modulemd2 lib64modulemd-gir2.0 lib64mpdec3 lib64nsl2 lib64repo0 lib64rpmsign9 lib64solv1 lib64yaml0_2 lib64zck1 \ - && urpmi --force --auto-update \ - && urpmi --force rx3-base mpm \ - && rm -f /var/log/dnf* /var/log/hawkey.log \ - && . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} - - +#------------------------------------------------------------------------------------------------------------------------------- +# Final Stage +#------------------------------------------------------------------------------------------------------------------------------- FROM scratch @@ -53,7 +40,8 @@ LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER} -COPY --from=0 / / + +COPY --from=builder /var/tmp/base_root / diff --git a/ReadMe.txt b/ReadMe.txt index 955f312..84d5ae6 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Base docker image! This project aims to build a Mageia base docker image to be used by other Rx3 packaging projects. Features: - - Curtently based on official Mageia 9 docker image from github.io, + - Curtently based on a custom build Mageia 9 image with Rx3 Docker Tools (mk_base_image), - Enable urpmi "Core", "Nonfree" and "Tainted" medium (x86-64 + i586) from mirror list: - http://mirror.xor.rx3/, - https://mirror.rx3.net/, @@ -18,7 +18,7 @@ Features: - Add Meta Package Manager (MPM), - Mono layered (Mageia + Rx3 Updates), - Strip down base (python & dnf removed), - - Image stacking log support. + - Image stacking log (ISL) support. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 28e45bb..e0d1c0e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,14 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Base V 1.5.0 - A. GIBERT - 2026/04/06 +------------------------------------------------------------------------------------------------------------------------------------ + +- New custome made image building with mk_base_image! +- Support new isl command, +- Use now rx3-base 1.1.0 RPM, +- Use now docker-tools-1.5.0. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Base V 1.4.1 - A. GIBERT - 2026/03/17 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 7e6604b..8bb7f0b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,8 +19,8 @@ services: IMG_VERSION: ${IMG_VERSION} IMG_MAINTAINER: ${IMG_MAINTAINER} IMG_URL: ${IMG_URL} - LANG: ${LANG} - LANGUAGE: ${LANGUAGE} - LOCALTIME: ${LOCALTIME} + IMG_LANG: ${LANG} + IMG_LANGUAGE: ${LANGUAGE} + IMG_LOCALTIME: ${LOCALTIME} restart: unless-stopped diff --git a/env.dist b/env.dist index 2c64241..1235624 100644 --- a/env.dist +++ b/env.dist @@ -18,7 +18,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" IMG_NAME="base" IMG_NAME_FULL="Rx3-Docker/Base Docker Image" -IMG_VERSION="1.4.1-mga9" +IMG_VERSION="1.5.0-mga9" IMG_MAINTAINER='"Arnaud G. GIBERT" ' IMG_URL_PREFIX="${ORG_URL_PREFIX}"