Compare commits
5 Commits
server-1.2
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| dbb5451c01 | |||
| d277b03f14 | |||
| 9a6237864a | |||
| 3ec4170d67 | |||
| 373a9488f1 |
194
Dockerfile
194
Dockerfile
@ -21,78 +21,152 @@ ARG SERVER_PORT_SV_INT
|
|||||||
|
|
||||||
ARG SERVER_LOG_INIT_FILE=${SERVER_LOG_INIT_DIR}/init.log
|
ARG SERVER_LOG_INIT_FILE=${SERVER_LOG_INIT_DIR}/init.log
|
||||||
|
|
||||||
|
ARG SERVER_CROND_INI=/etc/supervisord.d/crond.ini
|
||||||
|
|
||||||
|
ARG SERVER_DNSMASQ_INI=/etc/supervisord.d/dnsmasq.ini
|
||||||
|
ARG SERVER_DNSMASQ_CONF=/etc/dnsmasq.conf
|
||||||
|
ARG SERVER_RESOLV_CONF=/etc/resolv.conf
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
|
||||||
ARG INIT_SHELL='#!/bin/bash \n\
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
\n\
|
ARG INIT_SHELL='#!/bin/bash \n\
|
||||||
function log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a '${SERVER_LOG_INIT_FILE}'; } \n\
|
\n\
|
||||||
\n\
|
. /etc/profile.d/rx3.sh \n\
|
||||||
log "Starting" \n\
|
\n\
|
||||||
\n\
|
\n\
|
||||||
for pgm in /etc/rcD.d/* \n\
|
log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a '${SERVER_LOG_INIT_FILE}'; } \n\
|
||||||
do \n\
|
\n\
|
||||||
if [[ -r ${pgm} ]] \n\
|
\n\
|
||||||
then \n\
|
log "Starting" \n\
|
||||||
if [[ ${pgm##*/} == S99* ]] \n\
|
\n\
|
||||||
then \n\
|
for pgm in /etc/rcD.d/* \n\
|
||||||
log "Executing: [${pgm##*/}]" \n\
|
do \n\
|
||||||
log "Completed" \n\
|
if [[ -r ${pgm} ]] \n\
|
||||||
exec ${pgm} \n\
|
then \n\
|
||||||
else \n\
|
if [[ ${pgm##*/} == S99* ]] \n\
|
||||||
log "Calling: [${pgm##*/}]" \n\
|
then \n\
|
||||||
${pgm} \n\
|
log "Executing: [${pgm##*/}]" \n\
|
||||||
fi \n\
|
log "Completed" \n\
|
||||||
fi \n\
|
exec ${pgm} \n\
|
||||||
|
else \n\
|
||||||
|
log "Calling: [${pgm##*/}]" \n\
|
||||||
|
${pgm} \n\
|
||||||
|
fi \n\
|
||||||
|
fi \n\
|
||||||
done'
|
done'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
ARG SUPERVISORD='#!/bin/bash \n\
|
ARG CROND='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
exec supervisord -c /etc/supervisord.conf'
|
\n\
|
||||||
#---------------------------------------------------------------------------------------------------
|
if [[ "${SERVER_CROND_ENABLED}" != "TRUE" ]] \n\
|
||||||
|
then \n\
|
||||||
#---------------------------------------------------------------------------------------------------
|
file_enable "'${SERVER_CROND_INI}'" FALSE \n\
|
||||||
ARG CROND='#!/bin/bash \n\
|
else \n\
|
||||||
\n\
|
file_enable "'${SERVER_CROND_INI}'" TRUE \n\
|
||||||
if [[ "${SERVER_CROND_ENABLED}" != "TRUE" ]] \n\
|
|
||||||
then \n\
|
|
||||||
mv /etc/supervisord.d/crond.ini /etc/supervisord.d/crond.ini.disabled \n\
|
|
||||||
fi'
|
fi'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
ARG SUPERVISORD_INI='[inet_http_server] \n\
|
ARG DNSMASQ='#!/bin/bash \n\
|
||||||
port=*:'${SERVER_PORT_SV_INT}' \n\
|
\n\
|
||||||
\n\
|
\n\
|
||||||
[supervisord] \n\
|
if [[ "${SERVER_DNS_ENABLED}" != "TRUE" ]] \n\
|
||||||
nodaemon=true \n\
|
then \n\
|
||||||
childlogdir='${SERVER_LOG_SV_DIR}' \n\
|
file_enable "'${SERVER_DNSMASQ_INI}'" FALSE \n\
|
||||||
|
else \n\
|
||||||
|
file_enable "'${SERVER_DNSMASQ_INI}'" TRUE \n\
|
||||||
|
\n\
|
||||||
|
cp '${SERVER_DNSMASQ_CONF}'.dist '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
\n\
|
||||||
|
echo "" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "# Listen local address" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "interface=lo" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "bind-interfaces" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "port=53 # DNS only" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "no-dhcp-interface= # disables DHCPv4" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "# Forward local domains" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
\n\
|
||||||
|
for map in ${SERVER_DNS_MAP} \n\
|
||||||
|
do \n\
|
||||||
|
OIFS=$IFS \n\
|
||||||
|
IFS=":" \n\
|
||||||
|
set ${map} \n\
|
||||||
|
IFS=$OIFS \n\
|
||||||
|
\n\
|
||||||
|
domain="$1" \n\
|
||||||
|
server="$2" \n\
|
||||||
|
\n\
|
||||||
|
echo "server=/${domain}/${server}" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo "" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "# Forward all other queries to default server" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
echo "server=${SERVER_DNS_DEFAULT}" >> '${SERVER_DNSMASQ_CONF}' \n\
|
||||||
|
\n\
|
||||||
|
cp /etc/resolv.conf /etc/resolv.conf.old \n\
|
||||||
|
\n\
|
||||||
|
echo "# Generated by DNSMasq init script" > '${SERVER_RESOLV_CONF}' \n\
|
||||||
|
echo "" >> '${SERVER_RESOLV_CONF}' \n\
|
||||||
|
echo "nameserver 127.0.0.1" >> '${SERVER_RESOLV_CONF}' \n\
|
||||||
|
echo "search ${SERVER_DNS_SEARCH}" >> '${SERVER_RESOLV_CONF}' \n\
|
||||||
|
\n\
|
||||||
|
fi'
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
ARG SUPERVISORD='#!/bin/bash \n\
|
||||||
|
\n\
|
||||||
|
exec supervisord -c /etc/supervisord.conf'
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
ARG SUPERVISORD_INI='[inet_http_server] \n\
|
||||||
|
port=*:'${SERVER_PORT_SV_INT}' \n\
|
||||||
|
\n\
|
||||||
|
[supervisord] \n\
|
||||||
|
nodaemon=true \n\
|
||||||
|
childlogdir='${SERVER_LOG_SV_DIR}' \n\
|
||||||
user=root'
|
user=root'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
ARG CROND_INI='[program:crond] \n\
|
ARG CROND_INI='[program:crond] \n\
|
||||||
command=crond -n'
|
command=crond -n'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
ARG DNSMASQ_INI='[program:dnsmasq] \n\
|
||||||
|
command=dnsmasq -k'
|
||||||
|
#-----------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi --force supervisor \
|
RUN urpmi.update -a \
|
||||||
&& echo -e "${INIT_SHELL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/init.sh \
|
&& urpmi --force dnsmasq myip supervisor \
|
||||||
&& chmod a+x /usr/local/sbin/init.sh \
|
&& rm -f /var/log/README \
|
||||||
&& mkdir /etc/rc.d/rcD.d \
|
&& echo -e "${INIT_SHELL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/init.sh \
|
||||||
&& ln -s /etc/rc.d/rcD.d /etc \
|
&& chmod a+x /usr/local/sbin/init.sh \
|
||||||
&& mkdir "${SERVER_LOG_INIT_DIR}" \
|
&& mkdir /etc/rc.d/rcD.d \
|
||||||
&& echo -e "${CROND}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/crond \
|
&& ln -s /etc/rc.d/rcD.d /etc \
|
||||||
&& echo -e "${SUPERVISORD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/supervisord \
|
&& mkdir "${SERVER_LOG_INIT_DIR}" \
|
||||||
&& chmod a+x /etc/init.d/crond \
|
&& echo -e "${CROND}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/crond \
|
||||||
&& chmod a+x /etc/init.d/supervisord \
|
&& echo -e "${DNSMASQ}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/dnsmasq \
|
||||||
&& ln -s /etc/init.d/crond /etc/rcD.d/S60crond \
|
&& echo -e "${SUPERVISORD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/supervisord \
|
||||||
&& ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord \
|
&& chmod a+x /etc/init.d/crond \
|
||||||
&& echo -e "${CROND_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/crond.ini \
|
&& chmod a+x /etc/init.d/dnsmasq \
|
||||||
&& echo -e "${SUPERVISORD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/supervisord.ini
|
&& chmod a+x /etc/init.d/supervisord \
|
||||||
|
&& ln -s /etc/init.d/crond /etc/rcD.d/S60crond \
|
||||||
|
&& ln -s /etc/init.d/dnsmasq /etc/rcD.d/S65dnsmasq \
|
||||||
|
&& ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord \
|
||||||
|
&& echo -e "${CROND_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/crond.ini \
|
||||||
|
&& echo -e "${DNSMASQ_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/dnsmasq.ini \
|
||||||
|
&& echo -e "${SUPERVISORD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/supervisord.ini \
|
||||||
|
&& mv "${SERVER_DNSMASQ_CONF}" "${SERVER_DNSMASQ_CONF}.dist"
|
||||||
|
|
||||||
|
|
||||||
VOLUME ${SERVER_LOG_INIT_DIR}
|
VOLUME ${SERVER_LOG_INIT_DIR}
|
||||||
|
|||||||
@ -5,10 +5,12 @@ 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.
|
This project aims to build a Mageia server docker image to be used by other Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/base:1.3.2-mga9 image,
|
- Curtently based on rx3-docker/base:1.3.6-mga9 image,
|
||||||
- Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
- Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
||||||
- supervisord managing services,
|
- supervisord managing services,
|
||||||
- crond & logrotate configured & crond disabled by default,
|
- crond & logrotate configured & crond disabled by default,
|
||||||
|
- DNS forwarding support with dnsmasq, disabled by default,
|
||||||
|
- myip tool,
|
||||||
- Export init & supivisor log directories as volume.
|
- Export init & supivisor log directories as volume.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,56 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Server V 1.2.7 - A. GIBERT - 2025/11/28
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/base:1.3.6-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Update myip to 1.0.1.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Server V 1.2.4 - A. GIBERT - 2025/06/26
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/base:1.3.4-mga9 image,
|
||||||
|
- Fix re-run config bug on a already created container.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Server V 1.2.3 - A. GIBERT - 2025/05/28
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now 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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Server V 1.2.2 - A. GIBERT - 2025/04/13
|
Rx3-Docker/Server V 1.2.2 - A. GIBERT - 2025/04/13
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Use now rx3-docker/base:1.3.2-mga9 image.
|
- Use now rx3-docker/base:1.3.2-mga9 image,
|
||||||
|
- Add "urpmi.update -a" to force mirror sync.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,10 @@ services:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
SERVER_CROND_ENABLED: ${SERVER_CROND_ENABLED}
|
SERVER_CROND_ENABLED: ${SERVER_CROND_ENABLED}
|
||||||
|
SERVER_DNS_ENABLED: ${SERVER_DNS_ENABLED}
|
||||||
|
SERVER_DNS_DEFAULT: ${SERVER_DNS_DEFAULT}
|
||||||
|
SERVER_DNS_MAP: ${SERVER_DNS_MAP}
|
||||||
|
SERVER_DNS_SEARCH: ${SERVER_DNS_SEARCH}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./var/log/init:${SERVER_LOG_INIT_DIR}
|
- ./var/log/init:${SERVER_LOG_INIT_DIR}
|
||||||
|
|||||||
9
env.dist
9
env.dist
@ -18,13 +18,13 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
|||||||
|
|
||||||
IMG_NAME="server"
|
IMG_NAME="server"
|
||||||
IMG_NAME_FULL="Rx3-Docker/Server Docker Image"
|
IMG_NAME_FULL="Rx3-Docker/Server Docker Image"
|
||||||
IMG_VERSION="1.2.2-mga9"
|
IMG_VERSION="1.2.7-mga9"
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
|
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||||
|
|
||||||
IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.3.2-mga9"
|
IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.3.6-mga9"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -44,3 +44,8 @@ SERVER_LOG_INIT_DIR="/var/log/init"
|
|||||||
SERVER_LOG_SV_DIR="/var/log/supervisor"
|
SERVER_LOG_SV_DIR="/var/log/supervisor"
|
||||||
|
|
||||||
SERVER_CROND_ENABLED="FALSE"
|
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 nor.rx3 not.rx3 gw.rx3 mob.rx3 fix.rx3 vir.rx3 vpn.rx3 proto.rx3 rx3 rx3.net"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user