diff --git a/Dockerfile b/Dockerfile index 9d6b5bc..edd68fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -53,11 +54,15 @@ else fi' #---------------------------------------------------------------------------------------------------------------------------- + + #---------------------------------------------------------------------------------------------------------------------------- ARG HTTPD_INI='[program:httpd] \n\ command=/usr/sbin/httpd -DFOREGROUND' #---------------------------------------------------------------------------------------------------------------------------- + + #---------------------------------------------------------------------------------------------------------------------------- ARG HTTPD_CONF=' \n\ RewriteRule "^/$prefix$" "/$refix/" [R] \n\ @@ -79,6 +84,8 @@ RewriteEngine On ' #---------------------------------------------------------------------------------------------------------------------------- + + #---------------------------------------------------------------------------------------------------------------------------- ARG INFO_PHP=' /var/www/html/info.php + VOLUME ${APACHE_DOC_ROOT} VOLUME ${APACHE_LOG_DIR} + + EXPOSE ${APACHE_PORT} diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 5036041..102159a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.6.2 - A. GIBERT - 2026/02/14 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/server:1.3.0-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.6.1 - A. GIBERT - 2026/02/11 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index f0aa327..99f89ef 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,6 +19,7 @@ services: IMG_NAME_FULL: ${WA_IMG_NAME_FULL} IMG_VERSION: ${WA_IMG_VERSION} IMG_MAINTAINER: ${WA_IMG_MAINTAINER} + IMG_URL: ${WA_IMG_URL} IMG_FROM_URL: ${WA_IMG_FROM_URL} APACHE_DOC_ROOT: ${WA_DOC_ROOT} diff --git a/env.dist b/env.dist index 48cc3d5..74f0591 100644 --- a/env.dist +++ b/env.dist @@ -38,7 +38,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html" # | 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.6.1-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 httpd - 8080 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.6.2-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 httpd - 8080 80 - - apache apache