diff --git a/Dockerfile b/Dockerfile index 8f4131b..26856c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -148,6 +148,7 @@ command=dnsmasq -k' RUN urpmi.update -a \ && urpmi --force dnsmasq myip supervisor \ + && rm -f /var/log/README \ && echo -e "${INIT_SHELL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/init.sh \ && chmod a+x /usr/local/sbin/init.sh \ && mkdir /etc/rc.d/rcD.d \ diff --git a/ReadMe.txt b/ReadMe.txt index 038edaf..2f0516f 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Server docker image! This project aims to build a Mageia server docker image to be used by other Rx3 packaging projects. Features: - - Curtently based on rx3-docker/base:1.3.4-mga9 image, + - Curtently based on rx3-docker/base:1.3.5-mga9 image, - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d, - supervisord managing services, - crond & logrotate configured & crond disabled by default, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 06478f6..c96b59d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Server V 1.2.6 - A. GIBERT - 2025/09/19 +------------------------------------------------------------------------------------------------------------------------------------ + +- Update myip to 1.2.0, +- Use now rx3-docker/base:1.3.5-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Server V 1.2.5 - A. GIBERT - 2025/07/26 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index 57ac983..e758cc1 100644 --- a/env.dist +++ b/env.dist @@ -18,13 +18,13 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" IMG_NAME="server" IMG_NAME_FULL="Rx3-Docker/Server Docker Image" -IMG_VERSION="1.2.5-mga9" +IMG_VERSION="1.2.6-mga9" IMG_MAINTAINER='"Arnaud G. GIBERT" ' IMG_URL_PREFIX="${ORG_URL_PREFIX}" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" -IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.3.4-mga9" +IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.3.5-mga9" @@ -48,4 +48,4 @@ SERVER_CROND_ENABLED="FALSE" SERVER_DNS_ENABLED="FALSE" SERVER_DNS_DEFAULT="1.1.1.1" SERVER_DNS_MAP="rx3:10.0.0.1 10.in-addr.arpa:10.0.0.1 168.192.in-addr.arpa:10.0.0.1" -SERVER_DNS_SEARCH="xor.rx3 and.rx3 not.rx3 mob.rx3 fix.rx3 rx3 rx3.net" +SERVER_DNS_SEARCH="xor.rx3 and.rx3 nor.rx3 not.rx3 gw.rx3 mob.rx3 fix.rx3 vir.rx3 vpn.rx3 proto.rx3 rx3 rx3.net"