Compare commits
2 Commits
php-apache
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 451a7e9664 | |||
| 42225aabcc |
19
Dockerfile
19
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}
|
||||
@@ -19,6 +20,8 @@ ARG APACHE_DOC_ROOT
|
||||
ARG APACHE_LOG_DIR
|
||||
ARG APACHE_PORT
|
||||
|
||||
ARG HTTPD_CONF_FILE=/etc/httpd/conf/sites.d/default_vhost.d/30-rx3.conf
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -32,7 +35,7 @@ chmod u+s /usr/bin/pwauth
|
||||
\n\
|
||||
chown -R apache:apache /var/log/httpd \n\
|
||||
\n\
|
||||
for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/sites.d/default_vhost.d/50-rx3.conf \n\
|
||||
for file in /etc/httpd/conf/httpd.conf '${HTTPD_CONF_FILE}' \n\
|
||||
do \n\
|
||||
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\
|
||||
done \n\
|
||||
@@ -53,11 +56,15 @@ else
|
||||
fi'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_INI='[program:httpd] \n\
|
||||
command=/usr/sbin/httpd -DFOREGROUND'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_CONF='<Macro SupervisorProxy $prefix $host $port> \n\
|
||||
RewriteRule "^/$prefix$" "/$refix/" [R] \n\
|
||||
@@ -79,6 +86,8 @@ RewriteEngine On
|
||||
</Directory>'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG INFO_PHP='<?php \n\
|
||||
phpinfo(); \n\
|
||||
@@ -88,7 +97,8 @@ ARG INFO_PHP='<?php
|
||||
|
||||
|
||||
|
||||
RUN urpmi.update -a \
|
||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||
&& urpmi.update -a \
|
||||
&& urpmi --force apache apache-mod_proxy apache-mod_proxy_html apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \
|
||||
&& sed -i -e "s%#LoadModule macro_module modules/mod_macro.so%LoadModule macro_module modules/mod_macro.so%" /etc/httpd/conf/modules.d/00_base.conf \
|
||||
&& mv /etc/httpd/conf/sites.d/00_default_vhosts.conf /etc/httpd/conf/sites.d/00-default_vhost.conf \
|
||||
@@ -99,11 +109,14 @@ RUN urpmi.update -a
|
||||
&& chmod a+x /etc/init.d/httpd \
|
||||
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
|
||||
&& echo -e "${HTTPD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/httpd.ini \
|
||||
&& echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/sites.d/default_vhost.d/30-rx3.conf \
|
||||
&& echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${HTTPD_CONF_FILE} \
|
||||
&& echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php
|
||||
|
||||
|
||||
|
||||
VOLUME ${APACHE_DOC_ROOT}
|
||||
VOLUME ${APACHE_LOG_DIR}
|
||||
|
||||
|
||||
|
||||
EXPOSE ${APACHE_PORT}
|
||||
|
||||
@@ -18,6 +18,7 @@ Features:
|
||||
- PHP_UPLOAD_LIMIT variable set to 32M by defaylt.
|
||||
|
||||
|
||||
|
||||
Enjoy it!
|
||||
|
||||
Your Rx3 Team.
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.6.2 - A. GIBERT - 2026/02/16
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add ISL support,
|
||||
- Use now rx3-docker/server:1.3.0-mga9 image,
|
||||
- Fix rx3.conf file renaming bug.
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.6.1 - A. GIBERT - 2026/02/11
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -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}
|
||||
|
||||
2
env.dist
2
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
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user