- Now use rx3/php-apache-mga9:1.3.3 image,
- Variabilization of external server ports in env & compose file, - Now use docker_tools for .env building.
This commit is contained in:
parent
245a8529a3
commit
eef8d33716
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
ARG IMG_URL_PREFIX="rx3"
|
ARG IMG_URL_PREFIX="rx3"
|
||||||
|
|
||||||
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.2
|
FROM ${IMG_URL_PREFIX}/php-apache-mga9:1.3.3
|
||||||
|
|
||||||
ARG IMG_NAME
|
ARG IMG_NAME
|
||||||
ARG IMG_FULL_NAME
|
ARG IMG_FULL_NAME
|
||||||
|
@ -5,7 +5,7 @@ Welcome to Rx3/Tools-Mga9 docker image!
|
|||||||
This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
This is project aims to build Mageia 9 docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3/php-apache-mga9:1.3.2 image,
|
- Curtently based on rx3/php-apache-mga9:1.3.3 image,
|
||||||
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed,
|
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed,
|
||||||
- PostgreSQL server name, host & port configurable.
|
- PostgreSQL server name, host & port configurable.
|
||||||
|
|
||||||
|
@ -1,7 +1,17 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3/Tools-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Now use rx3/php-apache-mga9:1.3.3 image,
|
||||||
|
- Variabilization of external server ports in env & compose file,
|
||||||
|
- Now use docker_tools for .env building.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3/Tools-Mga9 V 1.0.0 - A. GIBERT - 2024/09/04
|
Rx3/Tools-Mga9 V 1.0.0 - A. GIBERT - 2024/09/04
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Initial release,
|
- Initial release,
|
||||||
- Use based on rx3/php-apache-mga9:1.3.2 image,
|
- Based on rx3/php-apache-mga9:1.3.2 image,
|
||||||
- PHPPGAdmin Installed.
|
- PHPPGAdmin Installed.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Rx3 PHP Apache Mageia-9 Docker Image
|
# Rx3 Tools Mageia-9 Docker Image
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
name: ${IMG_NAME}
|
name: ${IMG_NAME}
|
||||||
@ -23,6 +23,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
||||||
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
||||||
POSTGRESQL_HOST: ${POSTGRESQL_HOST}
|
POSTGRESQL_HOST: ${POSTGRESQL_HOST}
|
||||||
POSTGRESQL_PORT: ${POSTGRESQL_PORT}
|
POSTGRESQL_PORT: ${POSTGRESQL_PORT}
|
||||||
@ -33,5 +34,5 @@ services:
|
|||||||
network_mode: bridge
|
network_mode: bridge
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:9070:9001"
|
- "127.0.0.1:${WEBAPP_SV_PORT}:9001"
|
||||||
- "127.0.0.1:8070:80"
|
- "127.0.0.1:${WEBAPP_PORT}:80"
|
||||||
|
@ -18,7 +18,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
|||||||
|
|
||||||
IMG_NAME="tools-mga9"
|
IMG_NAME="tools-mga9"
|
||||||
IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image"
|
IMG_FULL_NAME="Rx3 Tools Mageia-9 Docker Image"
|
||||||
IMG_VERSION="1.0.0"
|
IMG_VERSION="1.0.1"
|
||||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
|
||||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
@ -28,6 +28,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
|||||||
# User Settings
|
# User Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
ENV_PORT_OFFSET=0
|
||||||
|
SV_PORT_OFFSET=1000
|
||||||
|
|
||||||
|
WEBAPP_PORT=$(( 8070 + ${ENV_PORT_OFFSET}))
|
||||||
|
WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET}))
|
||||||
|
|
||||||
APACHE_UID=980
|
APACHE_UID=980
|
||||||
APACHE_GID=977
|
APACHE_GID=977
|
||||||
APACHE_DOC_ROOT=/var/www/html
|
APACHE_DOC_ROOT=/var/www/html
|
Loading…
Reference in New Issue
Block a user