- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
This commit is contained in:
parent
bad45dfe9f
commit
e64e8eb257
@ -5,7 +5,8 @@ Rx3-Docker/Tools V 1.1.0 - A. GIBERT - 2024/11/11
|
||||
- Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools,
|
||||
- New version naming standard,
|
||||
- Now use docker_tools for .env building,
|
||||
- Use now rx3-docker/server:1.2.0-mga9 image.
|
||||
- Use now rx3-docker/server:1.2.0-mga9 image,
|
||||
- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
|
||||
|
||||
|
||||
|
||||
|
19
compose.yaml
19
compose.yaml
@ -15,16 +15,17 @@ services:
|
||||
context: .
|
||||
args:
|
||||
IMG_NAME: ${IMG_NAME}
|
||||
IMG_FULL_NAME: ${IMG_NAME_FULL}
|
||||
IMG_NAME_FULL: ${IMG_NAME_FULL}
|
||||
IMG_VERSION: ${IMG_VERSION}
|
||||
IMG_MAINTAINER: ${IMG_MAINTAINER}
|
||||
IMG_FROM_URL: ${IMG_FROM_URL}
|
||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
||||
|
||||
APACHE_DOC_ROOT: ${WEBTOOLS_DOC_ROOT}
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
||||
APACHE_DOC_ROOT: ${WEBTOOLS_DOC_ROOT}
|
||||
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
||||
POSTGRESQL_HOST: ${POSTGRESQL_HOST}
|
||||
POSTGRESQL_PORT: ${POSTGRESQL_PORT}
|
||||
@ -32,6 +33,18 @@ services:
|
||||
MARIADB_HOST: ${MARIADB_HOST}
|
||||
MARIADB_PORT: ${MARIADB_PORT}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${WEBTOOLS_PORT_MAIN_INT}"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
# - ./var/www/html:${WEBTOOLS_DOC_ROOT}
|
||||
- ./var/log/init:${WEBTOOLS_LOG_INIT_DIR}
|
||||
- ./var/log/supervisor:${WEBTOOLS_LOG_SV_DIR}
|
||||
- ./var/log/httpd:${WEBTOOLS_LOG_HTTPD_DIR}
|
||||
|
||||
ports:
|
||||
- "127.0.0.1:${WEBTOOLS_PORT_SV_EXT}:${WEBTOOLS_PORT_SV_INT}"
|
||||
- "127.0.0.1:${WEBTOOLS_PORT_MAIN_EXT}:${WEBTOOLS_PORT_MAIN_INT}"
|
||||
|
7
env.dist
7
env.dist
@ -42,9 +42,14 @@ WEBTOOLS_PORT_MAIN_INT=80
|
||||
WEBTOOLS_PORT_SV_EXT=$(( ${WEBTOOLS_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
||||
WEBTOOLS_PORT_SV_INT=9001
|
||||
|
||||
WEBTOOLS_LOG_INIT_DIR="/var/log/init"
|
||||
WEBTOOLS_LOG_SV_DIR="/var/log/supervisor"
|
||||
WEBTOOLS_LOG_HTTPD_DIR="/var/log/httpd"
|
||||
|
||||
WEBTOOLS_DOC_ROOT="/var/www/html"
|
||||
|
||||
APACHE_UID=980
|
||||
APACHE_GID=977
|
||||
APACHE_DOC_ROOT=/var/www/html
|
||||
|
||||
POSTGRESQL_SERVER_NAME="Default"
|
||||
POSTGRESQL_HOST="127.0.0.1"
|
||||
|
4
var/log/httpd/.gitignore
vendored
Normal file
4
var/log/httpd/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
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