Compare commits

..

No commits in common. "master" and "base-mga9-1.2.1" have entirely different histories.

6 changed files with 49 additions and 177 deletions

9
.env Normal file
View File

@ -0,0 +1,9 @@
IMG_ID="base-mga9"
IMG_NAME="Rx3 Base Mageia-9 Docker Image"
IMG_VERSION="1.2.1"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# To be configured
LANG=en_US.UTF-8
LANGUAGE=en_US.UTF-8:en_US:en
LOCALTIME="Europe/Paris"

View File

@ -1,4 +1,4 @@
# Rx3-Docker/Base Docker Image
# Rx3 Base Mageia-9 Docker Image
#-------------------------------------------------------------------------------
FROM mageia:9
@ -8,72 +8,32 @@ 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}" \
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 \
&& 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
&& 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
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_ID
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 org.rx3.${IMG_ID}.name=${IMG_NAME}
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}
COPY --from=0 / /
CMD ["/bin/bash"]
ENTRYPOINT []
ENTRYPOINT ["sleep", "60m"]

View File

@ -1,24 +1,19 @@
Welcome to Rx3-Docker/Base docker image!
Welcome to base-mga9 docker image!
This project aims to build a Mageia base docker image to be used by other Rx3 packaging projects.
This is project aims to build a Mageia 9 base docker image to be used by others Rx3 packaging projects.
Features:
- 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/,
- Curtently based on official Mageia9 docker image from github.io,
- Enable urpmi "Core", "Nonfree" and "Tainted" medium from "http://ftp.free.fr/" mirror,
- Add Rx3 bash seting,
- Mono layered (Mageia + Rx3 Updates),
- Strip down base (python & dnf removed).
- Mono layered (Mageia + Rx3 Updates)
Enjoy it!
Your Rx3 Team.
arnaud@rx3.net
https://git.rx3.org/gitea/rx3-docker/base
https://git.rx3.org/gitea/rx3/base-mga9

View File

@ -1,62 +1,5 @@
------------------------------------------------------------------------------------------------------------------------------------
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
Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
- Add LANG, LANGUAGE & LOCALTIME build args,
@ -65,7 +8,7 @@ Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------
- Mono Layer release whith multi-stage building,
@ -76,7 +19,7 @@ Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
-----------------------------------------------------------------------------------------------------------------------------------
- Mono Layer release: manually merged by docker export + copy.
@ -84,7 +27,7 @@ Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------
Rx3/Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------
- Initial release,

View File

@ -1,25 +1,24 @@
# Rx3-Docker/Base Docker Image
# Rx3 Base Mageia-9 Docker Image
#-------------------------------------------------------------------------------
name: ${IMG_NAME}
name: ${IMG_ID}
services:
base:
container_name: ${IMG_NAME}
hostname: ${IMG_NAME}
default:
container_name: ${IMG_ID}
image: ${IMG_URL}
image: docker.xor.rx3:5000/rx3/${IMG_ID}:${IMG_VERSION}
build:
context: .
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}
- IMG_ID=${IMG_ID}
- IMG_NAME=${IMG_NAME}
- IMG_VERSION=${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER}
- LANG=${LANG}
- LANGUAGE=${LANGUAGE}
- LOCALTIME=${LOCALTIME}
restart: unless-stopped
restart: unless-stopped

View File

@ -1,34 +0,0 @@
# 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"