Compare commits
No commits in common. "master" and "base-mga9-1.1.0" have entirely different histories.
master
...
base-mga9-
32
.env
32
.env
@ -1,32 +0,0 @@
|
||||
# Rx3 Base Mageia-9 Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Global Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
IMG_ORG="rx3"
|
||||
IMG_REGISTRY="docker.xor.rx3:5000"
|
||||
IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Image Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
IMG_NAME="base-mga9"
|
||||
IMG_FULL_NAME="Rx3 Base Mageia-9 Docker Image"
|
||||
IMG_VERSION="1.2.6"
|
||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
LANG=en_US.UTF-8
|
||||
LANGUAGE=en_US.UTF-8:en_US:en
|
||||
LOCALTIME="Europe/Paris"
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
*~
|
||||
*.old
|
||||
68
Dockerfile
68
Dockerfile
@ -1,68 +0,0 @@
|
||||
# Rx3 Base Mageia-9 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\
|
||||
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 \
|
||||
&& urpmi --force xz \
|
||||
&& 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_FULL_NAME
|
||||
ARG IMG_VERSION
|
||||
ARG 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}
|
||||
|
||||
|
||||
COPY --from=0 / /
|
||||
|
||||
CMD ["/bin/bash"]
|
||||
ENTRYPOINT []
|
||||
12
ReadMe.txt
12
ReadMe.txt
@ -1,18 +1,14 @@
|
||||
Welcome to Rx3/Base-Mga9 docker image!
|
||||
Welcome to base-mga9 docker image!
|
||||
|
||||
|
||||
|
||||
This is project aims to build a Mageia 9 base docker image to be used by others Rx3 packaging projects.
|
||||
This is project aim to build a Mageia 9 base docker image used by others Rx3 packaging projects.
|
||||
|
||||
Features:
|
||||
- Curtently based on official Mageia9 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/,
|
||||
- Enable urpmi "Core", "Nonfree" and "Tainted" medium from "http://ftp.free.fr/" mirror,
|
||||
- Add Rx3 bash seting,
|
||||
- Mono layered (Mageia + Rx3 Updates).
|
||||
- Multi layered (Mageia + Rx3 Updates) + Mono (Merged)
|
||||
|
||||
|
||||
Enjoy it!
|
||||
|
||||
@ -1,74 +1,13 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Base-Mga9 V 1.2.6 - A. GIBERT - 2024/10/04
|
||||
Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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,
|
||||
|
||||
26
compose.yaml
26
compose.yaml
@ -1,24 +1,10 @@
|
||||
# Rx3 Base Mageia-9 Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
name: ${IMG_NAME}
|
||||
version: '3'
|
||||
|
||||
name: base-mga9
|
||||
services:
|
||||
|
||||
default:
|
||||
container_name: ${IMG_NAME}
|
||||
|
||||
image: ${IMG_URL}
|
||||
|
||||
base-mga9:
|
||||
container_name: base-mga9
|
||||
image: docker.xor.rx3:5000/rx3/base-mga9:1.1.0
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
- IMG_NAME=${IMG_NAME}
|
||||
- IMG_FULL_NAME=${IMG_FULL_NAME}
|
||||
- IMG_VERSION=${IMG_VERSION}
|
||||
- IMG_MAINTAINER=${IMG_MAINTAINER}
|
||||
- LANG=${LANG}
|
||||
- LANGUAGE=${LANGUAGE}
|
||||
- LOCALTIME=${LOCALTIME}
|
||||
|
||||
context: mono
|
||||
restart: unless-stopped
|
||||
|
||||
15
mono/Dockerfile
Normal file
15
mono/Dockerfile
Normal file
@ -0,0 +1,15 @@
|
||||
# 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"]
|
||||
22
multi/Dockerfile
Normal file
22
multi/Dockerfile
Normal file
@ -0,0 +1,22 @@
|
||||
# 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"]
|
||||
Loading…
Reference in New Issue
Block a user