- Fix compose indetation.

- Move & Rename repo from Rx3/Base-MGA9 to Rx3-Docker/Base,
- New version naming standard, - Now use docker_tools for .env building, - Add ceteval bash function, - Strip down the base: - Remove python, - Remove dnf, - Rmove xz, - Remove unused libraries.
2024-11-11 23:04:02 +01:00 · 2024-11-10 23:20:19 +01:00 · 2024-10-04 14:55:18 +02:00 · 2024-10-02 14:14:54 +02:00 · 2024-08-28 16:09:58 +02:00 · 2024-08-27 00:26:23 +02:00
8 changed files with 228 additions and 53 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+*~
+*.old
--- a/79
+++ b/79
@ -0,0 +1,79 @@
+# Rx3-Docker/Base Docker Image
+#-------------------------------------------------------------------------------
+
+FROM mageia:9
+
+ARG LANG
+ARG LANGUAGE
+ARG LOCALTIME
+
+
+
+#---------------------------------------------------------------------------------------------------
+ARG LOCALE_CONF="LANG=${LANG}                                                                    \n\
+LANGUAGE=${LANGUAGE}"
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG RX3_SH='export PAGER=less                                                                    \n\
+export MANPAGER="less -isr"                                                                      \n\
+export EDITOR=emacs                                                                              \n\
+                                                                                                 \n\
+function cateval                                                                                 \n\
+{                                                                                                \n\
+    while read line                                                                              \n\
+    do                                                                                           \n\
+        eval $line 2>/dev/null                                                                   \n\
+        eval echo $( echo $line | sed -e `s/"/\\"/g`)                                            \n\
+    done <$1                                                                                     \n\
+}                                                                                                \n\
+                                                                                                 \n\
+alias ll="ls -la"                                                                                \n\
+alias em="emacs"'
+#---------------------------------------------------------------------------------------------------
+
+ARG MIRRORLIST='http://mirror.xor.rx3/mageia/distrib/9/x86_64 http://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 GIT_MPM_REPO='https://git.rx3.org/gitea/Rx3/mpm/raw/tag/mpm-1.0.0'
+
+
+
+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}"                                            \
+    && urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \
+    && 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                                                                      \
+    && rm    -f /var/log/dnf* /var/log/hawkey.log                                                       \
+    && echo  -e "${RX3_SH}"      | sed -e "s/\`/'/g" -e 's/ *$//' >/etc/profile.d/rx3.sh
+
+ADD    ${GIT_MPM_REPO}/sbin/mpm     /usr/local/sbin
+ADD    ${GIT_MPM_REPO}/etc/mpm.conf /etc
+RUN    chmod u+x                    /usr/local/sbin/mpm
+
+#COPY usr/local/sbin/mpm /usr/local/sbin
+#COPY etc/mpm.conf /etc
+
+
+FROM scratch
+
+ARG IMG_NAME
+ARG IMG_NAME_FULL
+ARG IMG_VERSION
+ARG IMG_MAINTAINER
+
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
+LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
+LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
+LABEL maintainer=${IMG_MAINTAINER}
+
+
+COPY --from=0 / /
+
+CMD ["/bin/bash"]
+ENTRYPOINT []
--- a/ReadMe.txt
+++ b/ReadMe.txt
@ -1,19 +1,24 @@
-Welcome to base-mga9 docker image!
+Welcome to Rx3-Docker/Base docker image!



-This is project aim to build a Mageia 9 base docker image used by others Rx3 packaging projects.
+This project aims to build a Mageia base docker image to be used by other Rx3 packaging projects.

 Features:
-    - Curtently based on official Mageia9 docker image from github.io,
-    - Enable urpmi "Core", "Nonfree" and "Tainted" medium from "http://ftp.free.fr/" mirror,
+    - Curtently based on official Mageia 9 docker image from github.io,
+    - Enable urpmi "Core", "Nonfree" and "Tainted" medium from mirror list:
+        - http://mirror.xor.rx3/,
+        - http://mirror.rx3.net/,
+        - ftp://ftp.proxad.net/,
+        - http://distrib-coffee.ipsl.jussieu.fr/,
    - Add Rx3 bash seting,
-    - Multi layered (Mageia + Rx3 Updates) + Mono (Merged)
-
+    - Mono layered (Mageia + Rx3 Updates),
+    - Strip down base (python & dnf removed).
+    

 Enjoy it!

 Your Rx3 Team.

 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/base-mga9
+https://git.rx3.org/gitea/rx3-docker/base
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@ -1,13 +1,90 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
+Rx3-Docker/Base V 1.3.0 - A. GIBERT - 2024/11/10
 ------------------------------------------------------------------------------------------------------------------------------------

+- Move & Rename repo from Rx3/Base-MGA9 to Rx3-Docker/Base,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Add ceteval bash function,
+- Strip down the base:
+  - Remove python,
+  - Remove dnf,
+  - Rmove xz,
+  - Remove unused libraries.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.6 - A. GIBERT - 2024/10/04
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add mpm 1.0.0 (Meta Package Manager).
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.5 - A. GIBERT - 2024/10/02
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add mirror list to urpmi and use Rx3 internal & external mirrors first.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.4 - A. GIBERT - 2024/08/28
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add xz rpm.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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,
+- Minor compose / dockerfile args improvements.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add LANG, LANGUAGE & LOCALTIME build args,
+- Set by default laguage to en_US.UTF-8 & timezone to Europe/Paris.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Mono Layer release whith multi-stage building,
+- Replace with label obsolete Maintainer command,
+- Use .env file,
+- Clean-up now uneeded sub dirs.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
+-----------------------------------------------------------------------------------------------------------------------------------
+
 - Mono Layer release: manually merged by docker export + copy.



 ------------------------------------------------------------------------------------------------------------------------------------
-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,
--- a/compose.yaml
+++ b/compose.yaml
@ -1,10 +1,25 @@
-version: '3'
+# Rx3-Docker/Base Docker Image
+#-------------------------------------------------------------------------------
+
+name:                           ${IMG_NAME}

-name: base-mga9
 services:
-  base-mga9:
-    container_name: base-mga9
-    image: docker.xor.rx3:5000/rx3/base-mga9:1.1.0
+
+  base:
+    container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
+    
+    image:                      ${IMG_URL}
+    
    build:
-      context: mono
-    restart: unless-stopped
+      context:                  .
+      args:
+        IMG_NAME:               ${IMG_NAME}
+        IMG_NAME_FULL:          ${IMG_NAME_FULL}
+        IMG_VERSION:            ${IMG_VERSION}
+        IMG_MAINTAINER:         ${IMG_MAINTAINER} 
+        LANG:                   ${LANG}
+        LANGUAGE:               ${LANGUAGE}
+        LOCALTIME:              ${LOCALTIME}
+       
+    restart:                    unless-stopped
--- a/env.dist
+++ b/env.dist
@ -0,0 +1,34 @@
+# Rx3-Docker/Base Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+ORG_NAME="rx3-docker"
+ORG_REGISTRY="docker.xor.rx3:5000"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+IMG_NAME="base"
+IMG_NAME_FULL="Rx3-Docker/Base Docker Image"
+IMG_VERSION="1.3.0-mga9"
+IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+IMG_URL_PREFIX="${ORG_URL_PREFIX}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+
+
+#-------------------------------------------------------------------------------
+# User Settings
+#-------------------------------------------------------------------------------
+
+LANG=en_US.UTF-8
+LANGUAGE=en_US.UTF-8:en_US:en
+LOCALTIME="Europe/Paris"
--- a/mono/Dockerfile
+++ b/mono/Dockerfile
@ -1,15 +0,0 @@
-# Base Mageia9 Rx3 Docker Image
-#-------------------------------------------------------------------------------
-
-FROM scratch
-
-ADD mageia9-rx3-rootfs.tar.bz2 /
-
-#CMD ["/bin/bash"]
-
-LABEL org.rx3.name="Rx3 Base Mageia9 Docker Image"
-LABEL org.rx3.version="1.1.0"
-
-MAINTAINER "Arnaud G. GIBERT" <arnaud@rx3.net>
-
-ENTRYPOINT ["sleep", "60m"]
--- a/multi/Dockerfile
+++ b/multi/Dockerfile
@ -1,22 +0,0 @@
-# Base Mageia9 Rx3 Docker Image
-#-------------------------------------------------------------------------------
-
-FROM mageia:9
-
-LABEL org.rx3.name="Rx3 Base Mageia9 Docker Image"
-LABEL org.rx3.version="1.0.0"
-
-MAINTAINER "Arnaud G. GIBERT" <arnaud@rx3.net>
-
-RUN    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 --auto-update \
-    && urpmi --force --replacepkgs glibc locales locales-en \
-    && urpmi --force sleep \
-    && rm -f /var/log/dnf* /var/log/hawkey.log \
-    && echo -e "LANG=en_US.UTF-8\nLANGUAGE=en_US.UTF-8:en_US:en" >/etc/locale.conf \
-    && echo -e "export PAGER=less\nexport MANPAGER='less -isr'\nexport EDITOR=emacs\nalias ll='ls -la'\nalias em='emacs'" >/etc/profile.d/rx3.sh
-
-ENTRYPOINT ["sleep", "60m"]
Author	SHA1	Message	Date
Arnaud G. GIBERT	065a98426c	- Fix compose indetation.	2024-11-11 23:04:02 +01:00
Arnaud G. GIBERT	c2b1abf29d	- Move & Rename repo from Rx3/Base-MGA9 to Rx3-Docker/Base, - New version naming standard, - Now use docker_tools for .env building, - Add ceteval bash function, - Strip down the base: - Remove python, - Remove dnf, - Rmove xz, - Remove unused libraries.	2024-11-10 23:20:19 +01:00
Arnaud G. GIBERT	c576a65a93	- Add mpm 1.0.0 (Meta Package Manager), - Fix mirror list in ReadMe.txt.	2024-10-04 14:55:18 +02:00
Arnaud G. GIBERT	e9bafeed3f	- Add mirror list to urpmi and use Rx3 internal & external mirrors first.	2024-10-02 14:14:54 +02:00
Arnaud G. GIBERT	ae9fa2dba6	- Add xz rpm.	2024-08-28 16:09:58 +02:00
Arnaud G. GIBERT	74f9715077	- Minor compose / dockerfile args & structure improvements.	2024-08-27 00:26:23 +02:00
Arnaud G. GIBERT	bc3d6d4a76	- Remove entrypoint now implemented by rx3/server-mga9 image, - Minor compose / dockerfile args improvments.	2024-08-25 18:12:54 +02:00
Arnaud G. GIBERT	9c5eb6a4fa	- Add LANG, LANGUAGE & LOCALTIME build args, - Set by default laguage to en_US.UTF-8 & timezone to Europe/Paris.	2024-08-24 22:58:35 +02:00
Arnaud G. GIBERT	378cd65c1e	- Mono Layer release whith multi-stage building, - Replace with label obsolete Maintainer command, - Use .env file, - Clean-up now uneeded sub dirs.	2024-08-22 14:40:37 +02:00