- Now use rx3/server-mga9:1.1.3 image,
- Add pwauth auth program, - Don't expose unneeded /var/www/html in compose file.
This commit is contained in:
parent
08ec413f3a
commit
2e4dbeadd6
2
.env
2
.env
@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
||||
|
||||
IMG_NAME="php-apache-mga9"
|
||||
IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
|
||||
IMG_VERSION="1.3.2"
|
||||
IMG_VERSION="1.3.3"
|
||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
19
Dockerfile
19
Dockerfile
@ -3,7 +3,7 @@
|
||||
|
||||
ARG IMG_URL_PREFIX="rx3"
|
||||
|
||||
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2
|
||||
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
|
||||
|
||||
ARG IMG_NAME
|
||||
ARG IMG_FULL_NAME
|
||||
@ -44,7 +44,10 @@ chown -R apache:apache /var/log/httpd
|
||||
for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/conf.d/rx3.conf \n\
|
||||
do \n\
|
||||
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\
|
||||
done'
|
||||
done \n\
|
||||
\n\
|
||||
chgrp apache /usr/bin/pwauth \n\
|
||||
chmod u+s /usr/bin/pwauth'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
@ -54,12 +57,12 @@ command=/usr/sbin/httpd -DFOREGROUND'
|
||||
|
||||
|
||||
|
||||
RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer \
|
||||
&& echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/conf.d/rx3.conf \
|
||||
&& echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php \
|
||||
&& echo -e "${HTTPD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/httpd \
|
||||
&& chmod a+x /etc/init.d/httpd \
|
||||
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
|
||||
RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \
|
||||
&& echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/conf.d/rx3.conf \
|
||||
&& echo -e "${INFO_PHP}" | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php \
|
||||
&& echo -e "${HTTPD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/httpd \
|
||||
&& 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
|
||||
|
||||
|
||||
|
@ -1,3 +1,13 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/PHP-Apache-Mga9 V 1.3.3 - A. GIBERT - 2024/10/04
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Now use rx3/server-mga9:1.1.3 image,
|
||||
- Add pwauth auth program,
|
||||
- Don't expose unneeded /var/www/html in compose file.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/PHP-Apache-Mga9 V 1.3.2 - A. GIBERT - 2024/08/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
@ -26,6 +26,9 @@ services:
|
||||
APACHE_GID: ${APACHE_GID}
|
||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
||||
|
||||
# volumes:
|
||||
# - ./html:/var/www/html
|
||||
|
||||
network_mode: bridge
|
||||
|
||||
ports:
|
||||
|
Loading…
Reference in New Issue
Block a user