diff --git a/Dockerfile b/Dockerfile
index 5e7c71d..15bc0b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,22 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/PHP-Apache Docker Image
#-------------------------------------------------------------------------------
-ARG IMG_URL_PREFIX="rx3"
+ARG IMG_FROM_URL="rx3-docker/server:latest"
-FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
+FROM ${IMG_FROM_URL}
ARG IMG_NAME
-ARG IMG_FULL_NAME
+ARG IMG_NAME_FULL
ARG IMG_VERSION
ARG IMG_MAINTAINER
-LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}
-#---------------------------------------------------------------------------------------------------
-ARG HTTPD_CONF='RewriteEngine On \n\
- \n\
- Options Includes Indexes FollowSymLinks \n\
- AllowOverride All \n\
- Require all granted \n\
-'
-#---------------------------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------------------------
-ARG INFO_PHP=''
-#---------------------------------------------------------------------------------------------------
-
#---------------------------------------------------------------------------------------------------
ARG HTTPD='#!/bin/bash \n\
\n\
@@ -55,20 +39,36 @@ ARG HTTPD_INI='[program:httpd]
command=/usr/sbin/httpd -DFOREGROUND'
#---------------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------------
+ARG HTTPD_CONF='RewriteEngine On \n\
+ \n\
+ Options Includes Indexes FollowSymLinks \n\
+ AllowOverride All \n\
+ Require all granted \n\
+'
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG INFO_PHP=''
+#---------------------------------------------------------------------------------------------------
+
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 \
- && sed -i -e "s/memory_limit = 128M/memory_limit = 512M/" /etc/php.d/01_ressourcelimits.ini \
- && sed -i -e "s/upload_max_filesize = 16M/upload_max_filesize = 32M/" /etc/php.d/01_fileuploads.ini \
- && sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini
+ && 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 \
+ && 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 \
+ && sed -i -e "s/memory_limit = 128M/memory_limit = 512M/" /etc/php.d/01_ressourcelimits.ini \
+ && sed -i -e "s/upload_max_filesize = 16M/upload_max_filesize = 32M/" /etc/php.d/01_fileuploads.ini \
+ && sed -i -e "s/post_max_size = 8M/post_max_size = 32M/" /etc/php.d/01_datahandling.ini
VOLUME /var/www/html
-EXPOSE 80
+EXPOSE ${APACHE_PORT}
diff --git a/ReadMe.txt b/ReadMe.txt
index 6e2d5c3..b5beab1 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,11 +1,11 @@
-Welcome to Rx3/PHP-Apache-Mga9 docker image!
+Welcome to Rx3-Docker/PHP-Apache docker image!
-This is project aims to build a PHP + Apache + Mageia 9 docker image used by others Rx3 packaging projects.
+This project aims to build a PHP + Apache docker image used by others Rx3 packaging projects.
Features:
- - Curtently based on rx3/server-mga9:1.1.2 image,
+ - Curtently based on rx3-docker/server:1.2.0-mga9 image,
- PostgreSQL & MySQL ready,
- PHPMailer installed,
- logrotate configured,
@@ -18,4 +18,4 @@ Your Rx3 Team.
--
arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/php-apache-mga9
+https://git.rx3.org/gitea/rx3-docker/php-apache
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 8906b9b..58e6c7e 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,14 @@
+------------------------------------------------------------------------------------------------------------------------------------
+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,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Use now rx3-docker/server:1.2.0-mga9 image.
+
+
+
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.3.3 - A. GIBERT - 2024/10/05
------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index 4f1793b..6ddee5d 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,36 +1,42 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/PHP-Apache Docker Image
#-------------------------------------------------------------------------------
-name: ${IMG_NAME}
+name: ${IMG_NAME}
services:
webapp:
- container_name: ${IMG_NAME}
+ container_name: ${IMG_NAME}
+ hostname: ${IMG_NAME}
- image: ${IMG_URL}
+ image: ${IMG_URL}
build:
- context: .
+ context: .
args:
- - IMG_NAME=${IMG_NAME}
- - IMG_FULL_NAME=${IMG_FULL_NAME}
- - IMG_VERSION=${IMG_VERSION}
- - IMG_MAINTAINER=${IMG_MAINTAINER}
- - IMG_URL_PREFIX=${IMG_URL_PREFIX}
+ IMG_NAME: ${IMG_NAME}
+ IMG_FULL_NAME: ${IMG_NAME_FULL}
+ IMG_VERSION: ${IMG_VERSION}
+ IMG_MAINTAINER: ${IMG_MAINTAINER}
+ IMG_FROM_URL: ${IMG_FROM_URL}
+ APACHE_PORT: ${WEBAPP_PORT_MAIN_INT}
- restart: unless-stopped
+ restart: unless-stopped
environment:
- APACHE_UID: ${APACHE_UID}
- APACHE_GID: ${APACHE_GID}
- APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
+ APACHE_UID: ${APACHE_UID}
+ APACHE_GID: ${APACHE_GID}
+ APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
+
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
+ interval: 10s
+ timeout: 3s
+ retries: 3
# volumes:
# - ./var/www/html:/var/www/html
- network_mode: bridge
-
ports:
- - "127.0.0.1:${WEBAPP_SV_PORT}:9001"
- - "127.0.0.1:${WEBAPP_PORT}:80"
+ - "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
+ - "127.0.0.1:${WEBAPP_PORT_MAIN_EXT}:${WEBAPP_PORT_MAIN_INT}"
diff --git a/env b/env.dist
similarity index 62%
rename from env
rename to env.dist
index 88ad546..a2c5285 100644
--- a/env
+++ b/env.dist
@@ -1,13 +1,14 @@
-# Rx3 PHP Apache Mageia-9 Docker Image
+# Rx3-Docker/PHP-Apache Docker Image
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Global Settings
#-------------------------------------------------------------------------------
-IMG_ORG="rx3"
-IMG_REGISTRY="docker.xor.rx3:5000"
-IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+ORG_NAME="rx3-docker"
+ORG_REGISTRY="docker.xor.rx3:5000"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@@ -15,12 +16,16 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
# Image Settings
#-------------------------------------------------------------------------------
-IMG_NAME="php-apache-mga9"
-IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
-IMG_VERSION="1.3.3"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+IMG_NAME="php-apache"
+IMG_NAME_FULL="Rx3-Docker/PHP-Apache Docker Image"
+IMG_VERSION="1.4.0-mga9"
IMG_MAINTAINER='"Arnaud G. GIBERT" '
+IMG_URL_PREFIX="${ORG_URL_PREFIX}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+
+IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
+
#-------------------------------------------------------------------------------
@@ -30,8 +35,11 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" '
ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000
-WEBAPP_PORT=$(( 8080 + ${ENV_PORT_OFFSET}))
-WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET}))
+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
APACHE_UID=980
APACHE_GID=977