Compare commits
10 Commits
server-mga
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ec4170d67 | |||
| 373a9488f1 | |||
| c924a727e4 | |||
| ff200ab4b8 | |||
| 1ac4e60906 | |||
| 28e24b2bd9 | |||
| eade80234e | |||
| 4fda154917 | |||
| 54c9fc477c | |||
| 74924d3de0 |
28
.env
28
.env
@ -1,28 +0,0 @@
|
||||
# Rx3 Server 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_ID="server-mga9"
|
||||
IMG_NAME="Rx3 Server Mageia-9 Docker Image"
|
||||
IMG_VERSION="1.0.0"
|
||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
|
||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
173
Dockerfile
173
Dockerfile
@ -1,20 +1,177 @@
|
||||
# Rx3 Server Mageia-9 Docker Image
|
||||
# Rx3-Docker/Server Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
ARG IMG_URL_PREFIX="rx3"
|
||||
ARG IMG_FROM_URL="rx3-docker/base:latest"
|
||||
|
||||
FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2
|
||||
FROM ${IMG_FROM_URL}
|
||||
|
||||
ARG IMG_ID
|
||||
ARG IMG_NAME
|
||||
ARG IMG_NAME_FULL
|
||||
ARG IMG_VERSION
|
||||
ARG 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 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 maintainer=${IMG_MAINTAINER}
|
||||
|
||||
ARG SERVER_LOG_INIT_DIR
|
||||
ARG SERVER_LOG_SV_DIR
|
||||
ARG SERVER_PORT_SV_INT
|
||||
|
||||
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\
|
||||
. /etc/profile.d/rx3.sh \n\
|
||||
\n\
|
||||
\n\
|
||||
log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a '${SERVER_LOG_INIT_FILE}'; } \n\
|
||||
\n\
|
||||
\n\
|
||||
log "Starting" \n\
|
||||
\n\
|
||||
for pgm in /etc/rcD.d/* \n\
|
||||
do \n\
|
||||
if [[ -r ${pgm} ]] \n\
|
||||
then \n\
|
||||
if [[ ${pgm##*/} == S99* ]] \n\
|
||||
then \n\
|
||||
log "Executing: [${pgm##*/}]" \n\
|
||||
log "Completed" \n\
|
||||
exec ${pgm} \n\
|
||||
else \n\
|
||||
log "Calling: [${pgm##*/}]" \n\
|
||||
${pgm} \n\
|
||||
fi \n\
|
||||
fi \n\
|
||||
done'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
ARG CROND='#!/bin/bash \n\
|
||||
\n\
|
||||
\n\
|
||||
if [[ "${SERVER_CROND_ENABLED}" != "TRUE" ]] \n\
|
||||
then \n\
|
||||
file_disenable "'${SERVER_CROND_INI}'" FALSE \n\
|
||||
else \n\
|
||||
file_disenable "'${SERVER_CROND_INI}'" TRUE \n\
|
||||
fi'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
ARG DNSMASQ='#!/bin/bash \n\
|
||||
\n\
|
||||
\n\
|
||||
if [[ "${SERVER_DNS_ENABLED}" != "TRUE" ]] \n\
|
||||
then \n\
|
||||
file_disenable "'${SERVER_DNSMASQ_INI}'" FALSE \n\
|
||||
else \n\
|
||||
file_disenable "'${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'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
ARG CROND_INI='[program:crond] \n\
|
||||
command=crond -n'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
ARG DNSMASQ_INI='[program:dnsmasq] \n\
|
||||
command=dnsmasq -k'
|
||||
#-----------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
RUN urpmi.update -a \
|
||||
&& urpmi --force dnsmasq myip supervisor \
|
||||
&& 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 \
|
||||
&& ln -s /etc/rc.d/rcD.d /etc \
|
||||
&& mkdir "${SERVER_LOG_INIT_DIR}" \
|
||||
&& echo -e "${CROND}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/crond \
|
||||
&& echo -e "${DNSMASQ}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/dnsmasq \
|
||||
&& echo -e "${SUPERVISORD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/supervisord \
|
||||
&& chmod a+x /etc/init.d/crond \
|
||||
&& chmod a+x /etc/init.d/dnsmasq \
|
||||
&& 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_SV_DIR}
|
||||
|
||||
EXPOSE ${SERVER_PORT_SV_INT}
|
||||
|
||||
CMD []
|
||||
ENTRYPOINT ["sleep", "60m"]
|
||||
ENTRYPOINT ["init.sh"]
|
||||
|
||||
14
ReadMe.txt
14
ReadMe.txt
@ -1,12 +1,16 @@
|
||||
Welcome to Rx3/Server-Mga9 docker image!
|
||||
Welcome to Rx3-Docker/Server docker image!
|
||||
|
||||
|
||||
|
||||
This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects.
|
||||
This project aims to build a Mageia server docker image to be used by other Rx3 packaging projects.
|
||||
|
||||
Features:
|
||||
- Curtently based on rx3/base-mga9:1.2.2 image,
|
||||
- ...
|
||||
- Curtently based on rx3-docker/base:1.3.4-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,
|
||||
- DNS forwarding support with dnsmasq, disabled by default,
|
||||
- Export init & supivisor log directories as volume.
|
||||
|
||||
|
||||
Enjoy it!
|
||||
@ -14,4 +18,4 @@ Enjoy it!
|
||||
Your Rx3 Team.
|
||||
|
||||
arnaud@rx3.net
|
||||
https://git.rx3.org/gitea/rx3/server-mga9
|
||||
https://git.rx3.org/gitea/rx3-docker/server
|
||||
|
||||
@ -1,5 +1,91 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Server-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
|
||||
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 "urpmi.update -a" to force mirror sync.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Server V 1.2.2 - A. GIBERT - 2025/04/13
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.2-mga9 image,
|
||||
- Add "urpmi.update -a" to force mirror sync.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Server V 1.2.1 - A. GIBERT - 2025/03/08
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/base:1.3.1-mga9 image.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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,
|
||||
- Add crond enabling via SERVER_CROND_ENABLE environement variable,
|
||||
- Add /var/log/init & var/log/supervisor volumes.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3/base-mga9:1.2.6 image,
|
||||
- Variabilization of external server ports in env & compose file,
|
||||
- Use now docker_tools for .env building.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3/base-mga9:1.2.4 image.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add & setup supervisord,
|
||||
- Add init.sh script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
|
||||
- Configure crond & logrotate.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/Server-Mga9 V 1.0.0 - A. GIBERT - 2024/08/25
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Initial release,
|
||||
|
||||
43
compose.yaml
43
compose.yaml
@ -1,22 +1,41 @@
|
||||
# Rx3 Server Mageia-9 Docker Image
|
||||
# Rx3-Docker/Server Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
name: ${IMG_ID}
|
||||
name: ${IMG_NAME}
|
||||
|
||||
services:
|
||||
|
||||
server:
|
||||
container_name: ${IMG_ID}
|
||||
container_name: ${IMG_NAME}
|
||||
hostname: ${IMG_NAME}
|
||||
|
||||
image: ${IMG_URL}
|
||||
image: ${IMG_URL}
|
||||
|
||||
build:
|
||||
context: .
|
||||
context: .
|
||||
args:
|
||||
- IMG_ID=${IMG_ID}
|
||||
- IMG_NAME=${IMG_NAME}
|
||||
- IMG_VERSION=${IMG_VERSION}
|
||||
- IMG_MAINTAINER=${IMG_MAINTAINER}
|
||||
- IMG_URL_PREFIX=${IMG_URL_PREFIX}
|
||||
|
||||
restart: unless-stopped
|
||||
IMG_NAME: ${IMG_NAME}
|
||||
IMG_NAME_FULL: ${IMG_NAME_FULL}
|
||||
IMG_VERSION: ${IMG_VERSION}
|
||||
IMG_MAINTAINER: ${IMG_MAINTAINER}
|
||||
IMG_FROM_URL: ${IMG_FROM_URL}
|
||||
|
||||
SERVER_LOG_INIT_DIR: ${SERVER_LOG_INIT_DIR}
|
||||
SERVER_LOG_SV_DIR: ${SERVER_LOG_SV_DIR}
|
||||
SERVER_PORT_SV_INT: ${SERVER_PORT_SV_INT}
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
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:
|
||||
- ./var/log/init:${SERVER_LOG_INIT_DIR}
|
||||
- ./var/log/supervisor:${SERVER_LOG_SV_DIR}
|
||||
|
||||
ports:
|
||||
- "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}"
|
||||
|
||||
51
env.dist
Normal file
51
env.dist
Normal file
@ -0,0 +1,51 @@
|
||||
# Rx3-Docker/Server 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="server"
|
||||
IMG_NAME_FULL="Rx3-Docker/Server Docker Image"
|
||||
IMG_VERSION="1.2.4-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.3.4-mga9"
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
ENV_PORT_OFFSET=0
|
||||
SV_PORT_OFFSET=1000
|
||||
|
||||
SERVER_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET}))
|
||||
|
||||
SERVER_PORT_SV_EXT=$(( ${SERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
||||
SERVER_PORT_SV_INT=9001
|
||||
|
||||
SERVER_LOG_INIT_DIR="/var/log/init"
|
||||
SERVER_LOG_SV_DIR="/var/log/supervisor"
|
||||
|
||||
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"
|
||||
4
var/log/init/.gitignore
vendored
Normal file
4
var/log/init/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
4
var/log/supervisor/.gitignore
vendored
Normal file
4
var/log/supervisor/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
Loading…
Reference in New Issue
Block a user