Compare commits
2 Commits
server-1.3
...
server-1.4
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a04cd8c43 | |||
| 452deb4c71 |
@@ -243,8 +243,8 @@ fi
|
||||
\n\
|
||||
cp '${SERVER_SV_HTTPD_CSS}.ref' '${SERVER_SV_HTTPD_CSS}' \n\
|
||||
cp '${SERVER_SV_HTTPD_PAGE}.ref' '${SERVER_SV_HTTPD_PAGE}' \n\
|
||||
sed -i -e "s%IMG_NAME_VERSION%$(isl_top -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\
|
||||
sed -i -e "s%IMG_STACK_LOG%$(isl_html_dump -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\
|
||||
sed -i -e "s%IMG_NAME_VERSION%$(isl --top --image)%" '${SERVER_SV_HTTPD_PAGE}' \n\
|
||||
sed -i -e "s%IMG_STACK_LOG%$(isl --html-dump --inline)%" '${SERVER_SV_HTTPD_PAGE}' \n\
|
||||
\n\
|
||||
exec supervisord -c /etc/supervisord.conf'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
@@ -281,7 +281,7 @@ port=*:'${SERVER_PORT_SV_INT}
|
||||
|
||||
|
||||
|
||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
||||
&& urpmi.update -a \
|
||||
&& urpmi --force dnsmasq myip supervisor \
|
||||
&& rm -f /var/log/README \
|
||||
|
||||
@@ -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.4.0-mga9 image,
|
||||
- Curtently based on rx3-docker/base:1.5.0-mga9 image,
|
||||
- Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
||||
- supervisord managing services,
|
||||
- supervisord httpd configured and enabled by default,
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Server V 1.4.0 - A. GIBERT - 2026/05/30
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Now use rx3-docker/base:1.5.0-mga9 image,
|
||||
- Now use docker-tools-1.5.2.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Server V 1.3.0 - A. GIBERT - 2026/02/16
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -5,8 +14,8 @@ Rx3-Docker/Server V 1.3.0 - A. GIBERT - 2026/02/16
|
||||
- Add ISL support,
|
||||
- Add ISL display to supervisor HTTPD status page,
|
||||
- Add SERVER_SV_HTTPD_ENABLED env variable,
|
||||
- Use now supervisor 4.3.0,
|
||||
- Use now rx3-docker/base:1.4.0-mga9 image,
|
||||
- Now use supervisor 4.3.0,
|
||||
- Now use rx3-docker/base:1.4.0-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -15,7 +24,7 @@ Rx3-Docker/Server V 1.3.0 - A. GIBERT - 2026/02/16
|
||||
Rx3-Docker/Server V 1.2.7 - A. GIBERT - 2025/11/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.6-mga9 image,
|
||||
- Now use rx3-docker/base:1.3.6-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -25,7 +34,7 @@ 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,
|
||||
- Now use rx3-docker/base:1.3.5-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -42,7 +51,7 @@ Rx3-Docker/Server V 1.2.5 - A. GIBERT - 2025/07/26
|
||||
Rx3-Docker/Server V 1.2.4 - A. GIBERT - 2025/06/26
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.4-mga9 image,
|
||||
- Now use rx3-docker/base:1.3.4-mga9 image,
|
||||
- Fix re-run config bug on a already created container.
|
||||
|
||||
|
||||
@@ -51,7 +60,7 @@ Rx3-Docker/Server V 1.2.4 - A. GIBERT - 2025/06/26
|
||||
Rx3-Docker/Server V 1.2.3 - A. GIBERT - 2025/05/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.3-mga9 image,
|
||||
- Now use rx3-docker/base:1.3.3-mga9 image,
|
||||
- Add dnsmasq to perform optional DNS forwarding,
|
||||
- Add myip tool,
|
||||
- Add "urpmi.update -a" to force mirror sync.
|
||||
@@ -62,7 +71,7 @@ Rx3-Docker/Server V 1.2.3 - A. GIBERT - 2025/05/28
|
||||
Rx3-Docker/Server V 1.2.2 - A. GIBERT - 2025/04/13
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.2-mga9 image,
|
||||
- Now use rx3-docker/base:1.3.2-mga9 image,
|
||||
- Add "urpmi.update -a" to force mirror sync.
|
||||
|
||||
|
||||
@@ -71,7 +80,7 @@ Rx3-Docker/Server V 1.2.2 - A. GIBERT - 2025/04/13
|
||||
Rx3-Docker/Server V 1.2.1 - A. GIBERT - 2025/03/08
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.1-mga9 image.
|
||||
- Now use rx3-docker/base:1.3.1-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -82,7 +91,7 @@ Rx3-Docker/Server V 1.2.0 - A. GIBERT - 2024/11/10
|
||||
- Move & Rename repo from Rx3/Server-MGA9 to Rx3-Docker/Server,
|
||||
- New version naming standard,
|
||||
- Now use docker_tools for .env building,
|
||||
- Use now rx3-docker/base:1.3.0-mga9 image,
|
||||
- Now use rx3-docker/base:1.3.0-mga9 image,
|
||||
- Add crond enabling via SERVER_CROND_ENABLE environement variable,
|
||||
- Add /var/log/init & var/log/supervisor volumes.
|
||||
|
||||
@@ -92,9 +101,9 @@ Rx3-Docker/Server V 1.2.0 - A. GIBERT - 2024/11/10
|
||||
Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3/base-mga9:1.2.6 image,
|
||||
- Now use rx3/base-mga9:1.2.6 image,
|
||||
- Variabilization of external server ports in env & compose file,
|
||||
- Use now docker_tools for .env building.
|
||||
- Now use docker_tools for .env building.
|
||||
|
||||
|
||||
|
||||
@@ -102,7 +111,7 @@ Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05
|
||||
Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3/base-mga9:1.2.4 image.
|
||||
- Now use rx3/base-mga9:1.2.4 image.
|
||||
|
||||
|
||||
|
||||
@@ -111,7 +120,7 @@ Rx3/Server-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Minor compose / dockerfile args & structure improvements,
|
||||
- Use now rx3/base-mga9:1.2.3 image.
|
||||
- Now use rx3/base-mga9:1.2.3 image.
|
||||
|
||||
|
||||
|
||||
|
||||
4
env.dist
4
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.3.0-mga9"
|
||||
IMG_VERSION="1.4.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}"
|
||||
|
||||
IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.4.0-mga9"
|
||||
IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.5.0-mga9"
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user