- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
This commit is contained in:
parent
4797d18971
commit
2de510e467
@ -15,6 +15,10 @@ 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 APACHE_DOC_ROOT
|
||||||
|
ARG APACHE_LOG_DIR
|
||||||
|
ARG APACHE_PORT
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
@ -69,6 +73,7 @@ RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_
|
|||||||
&& sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini
|
&& sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini
|
||||||
|
|
||||||
|
|
||||||
VOLUME /var/www/html
|
VOLUME ${APACHE_DOC_ROOT}
|
||||||
|
VOLUME ${APACHE_LOG_DIR}
|
||||||
|
|
||||||
EXPOSE ${APACHE_PORT}
|
EXPOSE ${APACHE_PORT}
|
||||||
|
@ -5,7 +5,8 @@ Rx3-Docker/PHP-Apache V 1.4.0 - A. GIBERT - 2024/11/11
|
|||||||
- Move & Rename repo from Rx3/PHP-Apache-MGA9 to Rx3-Docker/PHP-Apache,
|
- Move & Rename repo from Rx3/PHP-Apache-MGA9 to Rx3-Docker/PHP-Apache,
|
||||||
- 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/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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
14
compose.yaml
14
compose.yaml
@ -15,10 +15,13 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
IMG_NAME: ${IMG_NAME}
|
IMG_NAME: ${IMG_NAME}
|
||||||
IMG_FULL_NAME: ${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}
|
||||||
|
|
||||||
|
APACHE_DOC_ROOT: ${WEBAPP_DOC_ROOT}
|
||||||
|
APACHE_LOG_DIR: ${WEBAPP_LOG_HTTPD_DIR}
|
||||||
APACHE_PORT: ${WEBAPP_PORT_MAIN_INT}
|
APACHE_PORT: ${WEBAPP_PORT_MAIN_INT}
|
||||||
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -26,7 +29,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
APACHE_UID: ${APACHE_UID}
|
APACHE_UID: ${APACHE_UID}
|
||||||
APACHE_GID: ${APACHE_GID}
|
APACHE_GID: ${APACHE_GID}
|
||||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
APACHE_DOC_ROOT: ${WEBAPP_DOC_ROOT}
|
||||||
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
|
test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
|
||||||
@ -34,8 +37,11 @@ services:
|
|||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|
||||||
# volumes:
|
volumes:
|
||||||
# - ./var/www/html:/var/www/html
|
# - ./var/www/html:${WEBAPP_DOC_ROOT}
|
||||||
|
- ./var/log/init:${WEBAPP_LOG_INIT_DIR}
|
||||||
|
- ./var/log/supervisor:${WEBAPP_LOG_SV_DIR}
|
||||||
|
- ./var/log/httpd:${WEBAPP_LOG_HTTPD_DIR}
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
|
- "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
|
||||||
|
7
env.dist
7
env.dist
@ -41,6 +41,11 @@ WEBAPP_PORT_MAIN_INT=80
|
|||||||
WEBAPP_PORT_SV_EXT=$(( ${WEBAPP_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
WEBAPP_PORT_SV_EXT=$(( ${WEBAPP_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
|
||||||
WEBAPP_PORT_SV_INT=9001
|
WEBAPP_PORT_SV_INT=9001
|
||||||
|
|
||||||
|
WEBAPP_LOG_INIT_DIR="/var/log/init"
|
||||||
|
WEBAPP_LOG_SV_DIR="/var/log/supervisor"
|
||||||
|
WEBAPP_LOG_HTTPD_DIR="/var/log/httpd"
|
||||||
|
|
||||||
|
WEBAPP_DOC_ROOT="/var/www/html"
|
||||||
|
|
||||||
APACHE_UID=980
|
APACHE_UID=980
|
||||||
APACHE_GID=977
|
APACHE_GID=977
|
||||||
APACHE_DOC_ROOT=/var/www/html
|
|
||||||
|
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