- Move all supervisor logs from /tmp to /var/log/supivisor,
- Add /var/log/init & var/log/supervisor volumes.
This commit is contained in:
parent
28e24b2bd9
commit
1ac4e60906
28
Dockerfile
28
Dockerfile
@ -1,27 +1,32 @@
|
|||||||
# Rx3-Docker/Server Docker Image
|
# Rx3-Docker/Server Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
ARG IMG_FROM_URL="rx3-docker/base:latest"
|
||||||
|
|
||||||
|
FROM ${IMG_FROM_URL}
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
ARG IMG_FROM_URL
|
|
||||||
|
|
||||||
ARG SERVER_PORT_SV_INT
|
|
||||||
|
|
||||||
FROM ${IMG_FROM_URL}
|
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||||
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
||||||
LABEL 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 INIT_SHELL='#!/bin/bash \n\
|
ARG INIT_SHELL='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
function log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a /var/log/init.log; } \n\
|
function log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a '${SERVER_LOG_INIT_FILE}'; } \n\
|
||||||
\n\
|
\n\
|
||||||
log "Starting" \n\
|
log "Starting" \n\
|
||||||
\n\
|
\n\
|
||||||
@ -59,10 +64,11 @@ fi'
|
|||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
ARG SUPERVISORD_INI='[inet_http_server] \n\
|
ARG SUPERVISORD_INI='[inet_http_server] \n\
|
||||||
port=*:9001 \n\
|
port=*:'${SERVER_PORT_SV_INT}' \n\
|
||||||
\n\
|
\n\
|
||||||
[supervisord] \n\
|
[supervisord] \n\
|
||||||
nodaemon=true \n\
|
nodaemon=true \n\
|
||||||
|
childlogdir='${SERVER_LOG_SV_DIR}' \n\
|
||||||
user=root'
|
user=root'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -74,10 +80,11 @@ command=crond -n'
|
|||||||
|
|
||||||
|
|
||||||
RUN urpmi --force supervisor \
|
RUN urpmi --force supervisor \
|
||||||
&& echo -e "${INIT_SHELL}" | sed -e 's/ *$//' >/usr/local/sbin/init.sh \
|
&& echo -e "${INIT_SHELL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/init.sh \
|
||||||
&& chmod a+x /usr/local/sbin/init.sh \
|
&& chmod a+x /usr/local/sbin/init.sh \
|
||||||
&& mkdir /etc/rc.d/rcD.d \
|
&& mkdir /etc/rc.d/rcD.d \
|
||||||
&& ln -s /etc/rc.d/rcD.d /etc \
|
&& 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 "${CROND}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/crond \
|
||||||
&& echo -e "${SUPERVISORD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/supervisord \
|
&& 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/crond \
|
||||||
@ -86,7 +93,10 @@ RUN urpmi --force supervisor
|
|||||||
&& ln -s /etc/init.d/supervisord /etc/rcD.d/S99supervisord \
|
&& 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 "${CROND_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/crond.ini \
|
||||||
&& echo -e "${SUPERVISORD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/supervisord.ini
|
&& echo -e "${SUPERVISORD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/supervisord.ini
|
||||||
|
|
||||||
|
|
||||||
|
VOLUME ${SERVER_LOG_INIT_DIR}
|
||||||
|
VOLUME ${SERVER_LOG_SV_DIR}
|
||||||
|
|
||||||
EXPOSE ${SERVER_PORT_SV_INT}
|
EXPOSE ${SERVER_PORT_SV_INT}
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ Features:
|
|||||||
- Curtently based on rx3-docker/base:1.3.0-mga9 image,
|
- Curtently based on rx3-docker/base:1.3.0-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 & logrotate configured & crond disabled by default,
|
||||||
- crond disabled by default.
|
- Export init & supivisor log directories as volume.
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
@ -6,7 +6,8 @@ Rx3-Docker/Server V 1.2.0 - A. GIBERT - 2024/11/10
|
|||||||
- New version naming standard,
|
- New version naming standard,
|
||||||
- Now use docker_tools for .env building,
|
- Now use docker_tools for .env building,
|
||||||
- Use now rx3-docker/base:1.3.0-mga9 image,
|
- Use now rx3-docker/base:1.3.0-mga9 image,
|
||||||
- Add crond enabling via SERVER_CROND_ENABLE environement variable.
|
- Add crond enabling via SERVER_CROND_ENABLE environement variable,
|
||||||
|
- Add /var/log/init & var/log/supervisor volumes.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
32
compose.yaml
32
compose.yaml
@ -1,31 +1,37 @@
|
|||||||
# Rx3-Docker/Server Docker Image
|
# Rx3-Docker/Server Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
name: ${IMG_NAME}
|
name: ${IMG_NAME}
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
server:
|
server:
|
||||||
container_name: ${IMG_NAME}
|
container_name: ${IMG_NAME}
|
||||||
hostname: ${IMG_NAME}
|
hostname: ${IMG_NAME}
|
||||||
|
|
||||||
image: ${IMG_URL}
|
image: ${IMG_URL}
|
||||||
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
- IMG_NAME=${IMG_NAME}
|
IMG_NAME: ${IMG_NAME}
|
||||||
- IMG_NAME_FULL=${IMG_NAME_FULL}
|
IMG_NAME_FULL: ${IMG_NAME_FULL}
|
||||||
- IMG_VERSION=${IMG_VERSION}
|
IMG_VERSION: ${IMG_VERSION}
|
||||||
- IMG_MAINTAINER=${IMG_MAINTAINER}
|
IMG_MAINTAINER: ${IMG_MAINTAINER}
|
||||||
- IMG_FROM_URL=${IMG_FROM_URL}
|
IMG_FROM_URL: ${IMG_FROM_URL}
|
||||||
|
|
||||||
- SERVER_PORT_SV_INT=${SERVER_PORT_SV_INT}
|
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
|
restart: unless-stopped
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
SERVER_CROND_ENABLED: ${SERVER_CROND_ENABLED}
|
SERVER_CROND_ENABLED: ${SERVER_CROND_ENABLED}
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- ./var/log/init:${SERVER_LOG_INIT_DIR}
|
||||||
|
- ./var/log/supervisor:${SERVER_LOG_SV_DIR}
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}"
|
- "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}"
|
||||||
|
3
env.dist
3
env.dist
@ -40,4 +40,7 @@ SERVER_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET}))
|
|||||||
SERVER_PORT_SV_EXT=$(( ${SERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
SERVER_PORT_SV_EXT=$(( ${SERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
||||||
SERVER_PORT_SV_INT=9001
|
SERVER_PORT_SV_INT=9001
|
||||||
|
|
||||||
|
SERVER_LOG_INIT_DIR="/var/log/init"
|
||||||
|
SERVER_LOG_SV_DIR="/var/log/supervisor"
|
||||||
|
|
||||||
SERVER_CROND_ENABLED="FALSE"
|
SERVER_CROND_ENABLED="FALSE"
|
||||||
|
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