- Now use server-mga9:1.1.3 image,

- Variabilization of external server ports in env & compose file,
- Now use docker_tools for .env building.
This commit is contained in:
Arnaud G. GIBERT 2024-10-05 13:11:16 +02:00
parent 6ec93aa56e
commit 8f3ea49795
5 changed files with 27 additions and 8 deletions

View File

@ -3,7 +3,7 @@
ARG IMG_URL_PREFIX="rx3" 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_NAME
ARG IMG_FULL_NAME ARG IMG_FULL_NAME
@ -54,7 +54,6 @@ then
fi' fi'
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
#command=/usr/bin/pg_ctl start -D '${POSTGRESQL_DATA}' -s -o "-p '${POSTGRESQL_PORT}'" -w -t 300 \n\
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
ARG POSTGRESQLD_INI='[program:postgresqld] \n\ ARG POSTGRESQLD_INI='[program:postgresqld] \n\
command=/usr/bin/postgres -D '${POSTGRESQL_DATA}' -p '${POSTGRESQL_PORT}' \n\ command=/usr/bin/postgres -D '${POSTGRESQL_DATA}' -p '${POSTGRESQL_PORT}' \n\

View File

@ -1,3 +1,13 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PostgreSQL-Mga9 V 1.0.2 - A. GIBERT - 2024/10/05
------------------------------------------------------------------------------------------------------------------------------------
- Now use server-mga9:1.1.3 image,
- Variabilization of external server ports in env & compose file,
- Now use docker_tools for .env building.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/PostgreSQL-Mga9 V 1.0.1 - A. GIBERT - 2024/08/31 Rx3/PostgreSQL-Mga9 V 1.0.1 - A. GIBERT - 2024/08/31
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
@ -12,4 +22,4 @@ Rx3/PostgreSQL-Mga9 V 1.0.0 - A. GIBERT - 2024/08/30
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Initial release, - Initial release,
- Based on server-mga9:1.1.2 image. - Based on rx3/server-mga9:1.1.2 image.

View File

@ -30,10 +30,10 @@ services:
POSTGRESQL_PASSWORD: ${POSTGRESQL_PASSWORD} POSTGRESQL_PASSWORD: ${POSTGRESQL_PASSWORD}
volumes: volumes:
- ./pgsql-data:/var/lib/pgsql/data - ./var/lib/pgsql/data:/var/lib/pgsql/data
network_mode: bridge network_mode: bridge
ports: ports:
- "127.0.0.1:9013:9001" - "127.0.0.1:${DATABASE_SV_PORT}:9001"
- "127.0.0.1:8032:5432" - "127.0.0.1:${DATABASE_PORT}:5432"

View File

@ -16,8 +16,8 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_NAME="postgresql-mga9" IMG_NAME="postgresql-mga9"
IMG_FULL_NAME="Rx3 MariaDB Mageia-9 Docker Image" IMG_FULL_NAME="Rx3 PostgreSQL Mageia-9 Docker Image"
IMG_VERSION="1.0.1" IMG_VERSION="1.0.2"
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>'
@ -27,6 +27,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# User Settings # User Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000
DATABASE_PORT=$(( 8032 + ${ENV_PORT_OFFSET}))
DATABASE_SV_PORT=$(( ${DATABASE_PORT} + ${SV_PORT_OFFSET}))
POSTGRESQL_UID=971 POSTGRESQL_UID=971
POSTGRESQL_GID=971 POSTGRESQL_GID=971
POSTGRESQL_POSTGRES_PASSWORD="postgresadmin" POSTGRESQL_POSTGRES_PASSWORD="postgresadmin"

4
var/lib/pgsql/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore