diff --git a/Dockerfile b/Dockerfile index 70c9956..ba1e698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,7 @@ ARG INFO_PHP=' /etc/init.d/httpd \ && chmod a+x /etc/init.d/httpd \ && ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \ diff --git a/ReadMe.txt b/ReadMe.txt index b5beab1..f6259e2 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -2,14 +2,15 @@ Welcome to Rx3-Docker/PHP-Apache docker image! -This project aims to build a PHP + Apache docker image used by others Rx3 packaging projects. +This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects. Features: - Curtently based on rx3-docker/server:1.2.0-mga9 image, - PostgreSQL & MySQL ready, - PHPMailer installed, - logrotate configured, - - Apache UID, GID & document root directory configurable. + - Apache UID, GID & document root directory configurable, + - mod_proxy + mod_proxy_html installed. Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3d6e723..9a5990d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.5.0 - A. GIBERT - 2024/12/21 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add apache mod proxy to support reverse proxy configuration. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.4.0 - A. GIBERT - 2024/11/11 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index df7c0b5..bd3197f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,48 +1,49 @@ # Rx3-Docker/PHP-Apache Docker Image #------------------------------------------------------------------------------- -name: ${IMG_NAME} +name: ${HOST_NAME_PREFIX} services: +#------------------------------------------------------------------------------- + webapp: - container_name: ${IMG_NAME} - hostname: ${IMG_NAME} + container_name: ${WA_HOST_NAME} + hostname: ${WA_HOST_NAME} - image: ${IMG_URL} + image: ${WA_IMG_URL} build: - context: . args: - IMG_NAME: ${IMG_NAME} - IMG_NAME_FULL: ${IMG_NAME_FULL} - IMG_VERSION: ${IMG_VERSION} - IMG_MAINTAINER: ${IMG_MAINTAINER} - 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} - - restart: unless-stopped + IMG_NAME: ${WA_IMG_URL} + IMG_NAME_FULL: ${WA_IMG_NAME_FULL} + IMG_VERSION: ${WA_IMG_VERSION} + IMG_MAINTAINER: ${WA_IMG_MAINTAINER} + IMG_FROM_URL: ${WA_IMG_FROM_URL} + + APACHE_DOC_ROOT: ${WA_DOC_ROOT} + APACHE_LOG_DIR: ${WA_LOG_MAIN_INT} + APACHE_PORT: ${WA_PORT_MAIN_INT} + + restart: unless-stopped environment: - APACHE_UID: ${APACHE_UID} - APACHE_GID: ${APACHE_GID} - APACHE_DOC_ROOT: ${WEBAPP_DOC_ROOT} + APACHE_UID: ${WA_USER_ID} + APACHE_GID: ${WA_GROUP_ID} + APACHE_DOC_ROOT: ${WA_DOC_ROOT} healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"] - interval: 10s - timeout: 3s - retries: 3 + test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}"] + interval: 10s + timeout: 3s + retries: 3 volumes: -# - ./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} - + - ./${WA_LIB_EXT}:${WA_LIB_INT} + - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} + - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT} + - ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT} + ports: - - "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}" - - "127.0.0.1:${WEBAPP_PORT_MAIN_EXT}:${WEBAPP_PORT_MAIN_INT}" + - "127.0.0.1:${WA_PORT_SV_EXT}:${WA_PORT_SV_INT}" + - "127.0.0.1:${WA_PORT_MAIN_EXT}:${WA_PORT_MAIN_INT}" diff --git a/env.dist b/env.dist index 7d85a2b..689f9a2 100644 --- a/env.dist +++ b/env.dist @@ -5,8 +5,10 @@ # Global Settings #------------------------------------------------------------------------------- + ORG_NAME="rx3-docker" ORG_REGISTRY="docker.xor.rx3:5000" +ORG_MAINTAINER='"Arnaud G. GIBERT" ' ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" @@ -15,16 +17,27 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" #------------------------------------------------------------------------------- # Image Settings #------------------------------------------------------------------------------- +HOST_NAME_PREFIX="" -IMG_NAME="php-apache" -IMG_NAME_FULL="Rx3-Docker/PHP-Apache Docker Image" -IMG_VERSION="1.4.0-mga9" -IMG_MAINTAINER='"Arnaud G. GIBERT" ' +PORT_ENV_OFFSET=0 -IMG_URL_PREFIX="${ORG_URL_PREFIX}" -IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" +PORT_SV_INT=9001 +PORT_SV_OFFSET=1000 -IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9" +DOCKER_TOOLS_DEBUG=FALSE +DOCKER_TOOLS_VOLUME=SINGLE +#DOCKER_TOOLS_VOLUME=MERGED +#DOCKER_TOOLS_VOLUME=SPLITED +DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html" + + + +#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ +# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group | +# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | +#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ + +docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.5.0-mga9 ${ORG_URL_PREFIX} server 1.2.0-mga9 httpd - 8080 80 - - apache apache @@ -32,20 +45,6 @@ IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9" # User Settings #------------------------------------------------------------------------------- -ENV_PORT_OFFSET=0 -SV_PORT_OFFSET=1000 +SERVER_CROND_ENABLED="FALSE" -WEBAPP_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET})) -WEBAPP_PORT_MAIN_INT=80 - -WEBAPP_PORT_SV_EXT=$(( ${WEBAPP_PORT_MAIN_EXT} + ${SV_PORT_OFFSET})) -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_GID=977 +WA_DOC_ROOT="/var/www/html"