- Use now rx3-docker/server:1.2.2-mga9 image.

- Update env.dist & compose files to fully support docker_service_add Docker Tools function.

.env

@@ -1,35 +0,0 @@
-# Rx3 PostgreSQL Mageia-9 Docker Image
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Global Settings
-#-------------------------------------------------------------------------------
-
-IMG_ORG="rx3"
-IMG_REGISTRY="docker.xor.rx3:5000"
-IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
-
-
-
-#-------------------------------------------------------------------------------
-# Image Settings
-#-------------------------------------------------------------------------------
-
-IMG_NAME="postgresql-mga9"
-IMG_FULL_NAME="Rx3 MariaDB Mageia-9 Docker Image"
-IMG_VERSION="1.0.1"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
-
-
-
-#-------------------------------------------------------------------------------
-# User Settings
-#-------------------------------------------------------------------------------
-
-POSTGRESQL_UID=971
-POSTGRESQL_GID=971
-POSTGRESQL_POSTGRES_PASSWORD="postgresadmin"
-POSTGRESQL_DATABASE="test"
-POSTGRESQL_USER="test"
-POSTGRESQL_PASSWORD="testadmin"

Dockerfile

@@ -1,23 +1,29 @@
-# Rx3 PosgreSQL Mageia-9 Docker Image
+# Rx3-Docker/PosgreSQL Docker Image
 #-------------------------------------------------------------------------------
 
-ARG IMG_URL_PREFIX="rx3"
+ARG IMG_FROM_URL="rx3-docker/server:latest"
 
-FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2
+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 POSTGRESQL_LIB=/var/lib/pgsql
+ARG POSTGRESQL_LIB
-ARG POSTGRESQL_DATA=${POSTGRESQL_LIB}/data
+ARG POSTGRESQL_LOG
-ARG POSTGRESQL_PORT=5432
+ARG POSTGRESQL_PORT
+ARG POSTSQL_LOG_DIR
+
+ARG POSTGRESQL_DATA="${POSTGRESQL_LIB}/data"
+ARG POSTSQL_LOG_FILE="${POSTSQL_LOG_DIR}/postsql.log"
+
+
 
 #-----------------------------------------------------------------------------------------------------------------------------
 ARG POSTGRESQLD='#!/bin/bash                                                                                               \n\
@@ -42,6 +48,7 @@ then
                                                                                                                            \n\
         if [[ -n "${POSTGRESQL_DATABASE}" ]]                                                                               \n\
         then                                                                                                               \n\
+            echo "ALTER DATABASE \"${POSTGRESQL_DATABASE}\" OWNER TO \"${POSTGRESQL_USER}\";"             >>/tmp/post.sql  \n\
             echo "GRANT ALL PRIVILEGES ON DATABASE \"${POSTGRESQL_DATABASE}\" TO \"${POSTGRESQL_USER}\";" >>/tmp/post.sql  \n\
         fi                                                                                                                 \n\
     fi                                                                                                                     \n\
@@ -52,19 +59,18 @@ then
     echo "host    all             all             0.0.0.0/0               password" >>'${POSTGRESQL_DATA}'/pg_hba.conf     \n\
     sed -i "s/#port = 5432/listen_addresses=`*`\\n#port = 5432/"                      '${POSTGRESQL_DATA}'/postgresql.conf \n\
 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\
 command=/usr/bin/postgres -D '${POSTGRESQL_DATA}' -p '${POSTGRESQL_PORT}'                                                  \n\
 user=postgres'
-#---------------------------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------------------------------------------------------
 ARG POSTSQL='#!/bin/bash                                                                                                   \n\
                                                                                                                            \n\
-function log() { echo "$(date --rfc-3339=ns) PostSQL: $*" | tee -a /var/log/postsql.log; }       \n\
+function log() { echo "$(date --rfc-3339=ns) PostSQL: $*" | tee -a '${POSTSQL_LOG_FILE}'; }                                \n\
                                                                                                                            \n\
 log "Starting"                                                                                                             \n\
                                                                                                                            \n\
@@ -90,16 +96,17 @@ else
 fi                                                                                                                         \n\
                                                                                                                            \n\
 log "Completed"'
-#---------------------------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------------------------------------------------------
 ARG POSTSQL_INI='[program:postsql]                                                                                         \n\
 command=/usr/local/sbin/postsql'
-#---------------------------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------------------------------------------------------
 
 
 
-RUN    urpmi --force postgresql15 postgresql15-server postgresql15-pl                                             \
+RUN    urpmi.update -a                                                                                                       \
+    && urpmi --force postgresql15 postgresql15-server postgresql15-pl                                                        \
     && echo  -e   "${POSTGRESQLD}"     | sed -e "s/\`/'/g" -e 's/ *$//'                 > /etc/init.d/postgresqld            \
     && chmod a+x /etc/init.d/postgresqld                                                                                     \
     && ln    -s   /etc/init.d/postgresqld /etc/rcD.d/S30postgresqld                                                          \
@@ -109,6 +116,7 @@ RUN    urpmi --force postgresql15 postgresql15-server postgresql15-pl
     && echo  -e   "${POSTSQL_INI}"     | sed -e 's/ *$//'                               > /etc/supervisord.d/postsql.ini
 
 
-VOLUME /var/lib/pgsql
+VOLUME ${POSTGRESQL_LIB}
+VOLUME ${POSTGRESQL_LOG}
 
-EXPOSE 5432
+EXPOSE ${POSTGRESQL_PORT}

ReadMe.txt

@@ -1,11 +1,11 @@
-Welcome to Rx3/PostgreSQL-Mga9 docker image!
+Welcome to Rx3-Docker/PostgreSQL docker image!
 
 
 
-This is project aims to build a PostgreSQL + Mageia 9 docker image used by others Rx3 packaging projects.
+This project aims to build a PostgreSQL docker image used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3/server-mga9:1.1.2 image,
+    - Curtently based on rx3-docker/server:1.2.2-mga9 image,
     - Following env vars supported:
        - POSTGRESQL_UID & POSTGRESQL_GID,
        - POSTGRESQL_POSTGRES_PASSWORD,
@@ -19,4 +19,4 @@ Your Rx3 Team.
 
 --
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/postgresql-mga9
+https://git.rx3.org/gitea/rx3-docker/postgresql

ReleaseNotes.txt

@@ -1,3 +1,51 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PostgreSQL V 1.1.3 - A. GIBERT - 2025/04/21
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3-docker/server:1.2.2-mga9 image.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PostgreSQL V 1.1.2 - A. GIBERT - 2025/03/10
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add "ALTER DATABASE" in postsql to change database owner to POSTGRESQL_USER,
+- Update env.dist & compose files to fully support docker_service_add Docker Tools function.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PostgreSQL V 1.1.1 - A. GIBERT - 2025/03/08
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3-docker/server:1.2.1-mga9 image.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/PostgreSQL V 1.1.0 - A. GIBERT - 2024/11/12
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move & Rename repo from Rx3/PostgreSQL-MGA9 to Rx3-Docker/PostgreSQL,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Use now rx3-docker/server:1.2.0-mga9 image,
+- Add /var/log/init, /var/log/supervisor & var/log/postgres volumes,
+- Add healthcheck example in compose file.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/PostgreSQL-Mga9 V 1.0.2 - A. GIBERT - 2024/10/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3/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
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -12,4 +60,4 @@ Rx3/PostgreSQL-Mga9 V 1.0.0 - A. GIBERT - 2024/08/30
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,
-- Based on server-mga9:1.1.2 image.
+- Based on rx3/server-mga9:1.1.2 image.

compose.yaml

@@ -1,39 +1,54 @@
-# Rx3 PostgreSQL Mageia-9 Docker Image
+# Rx3-Docker/PostgreSQL Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name:                               ${DATABASE_IMG_NAME}
 
 services:
 
   database:
-    container_name: ${IMG_NAME}
+    container_name:                 ${DATABASE_IMG_NAME}
+    hostname:                       ${DATABASE_IMG_NAME}
     
-    image: ${IMG_URL}
+    image:                          ${DATABASE_IMG_URL}
 
     build:
       context:                      .
       args:
-        - IMG_NAME=${IMG_NAME}
+        IMG_NAME:                   ${DATABASE_IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
+        IMG_NAME_FULL:              ${DATABASE_IMG_NAME_FULL}
-        - IMG_VERSION=${IMG_VERSION}
+        IMG_VERSION:                ${DATABASE_IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
+        IMG_MAINTAINER:             ${DATABASE_IMG_MAINTAINER}
-        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
+        IMG_FROM_URL:               ${DATABASE_IMG_FROM_URL}
+
+        POSTGRESQL_LIB:             ${DATABASE_LIB_INT}
+        POSTGRESQL_LOG:             ${DATABASE_LOG_MAIN_INT}
+        POSTGRESQL_PORT:            ${DATABASE_PORT_MAIN_INT}
+        POSTSQL_LOG_DIR:            ${DATABASE_LOG_INIT_INT}
         
     restart:                        unless-stopped
     
     environment:
-      POSTGRESQL_UID:               ${POSTGRESQL_UID}
+      POSTGRESQL_UID:               ${DATABASE_USER_ID}
-      POSTGRESQL_GID:               ${POSTGRESQL_GID}
+      POSTGRESQL_GID:               ${DATABASE_GROUP_ID}
+      
       POSTGRESQL_POSTGRES_PASSWORD: ${POSTGRESQL_POSTGRES_PASSWORD}
       POSTGRESQL_DATABASE:          ${POSTGRESQL_DATABASE}
       POSTGRESQL_USER:              ${POSTGRESQL_USER}
       POSTGRESQL_PASSWORD:          ${POSTGRESQL_PASSWORD}
       
-    volumes:
+    healthcheck:
-      - ./pgsql-data:/var/lib/pgsql/data
+      test:                         ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE}'"]
+      interval:                     10s
+      timeout:                      3s
+      retries:                      3
       
-    network_mode: bridge
+    volumes:
+      - ./${DATABASE_LIB_EXT}:${DATABASE_LIB_INT}
+      - ./${DATABASE_LOG_INIT_EXT}:${DATABASE_LOG_INIT_INT}
+      - ./${DATABASE_LOG_SV_EXT}:${DATABASE_LOG_SV_INT}
+      - ./${DATABASE_LOG_MAIN_EXT}:${DATABASE_LOG_MAIN_INT}
       
     ports:
-      - "127.0.0.1:9013:9001"
+      - "127.0.0.1:${DATABASE_PORT_SV_EXT}:${DATABASE_PORT_SV_INT}"
-      - "127.0.0.1:8032:5432"
+      - "127.0.0.1:${DATABASE_PORT_MAIN_EXT}:${DATABASE_PORT_MAIN_INT}"
+

env.dist

@@ -0,0 +1,55 @@
+# Rx3-Docker/PostgreSQL Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+ORG_NAME="rx3-docker"
+ORG_REGISTRY="docker.xor.rx3:5000"
+ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+HOST_NAME_PREFIX=""
+
+PORT_ENV_OFFSET=0
+
+PORT_SV_INT=9001
+PORT_SV_OFFSET=1000
+
+NETWORK_NAME=${HOST_NAME_PREFIX}
+NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
+
+DOCKER_TOOLS_DEBUG=FALSE
+
+DOCKER_TOOLS_VOLUME=SINGLE
+#DOCKER_TOOLS_VOLUME=MIXED
+#DOCKER_TOOLS_VOLUME=MERGED
+#DOCKER_TOOLS_VOLUME=SPLIT
+
+DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
+
+#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
+#                  | Variable | Service                  | Target Image                                                                                 | From Image                                      | Module                    | Main Port     | Admin Port    | User         | Group        |
+#                  | 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   DATABASE   database                   ${ORG_URL_PREFIX}    postgresql         "Rx3-Docker/PostgreSQL"         1.1.3-mga9             ${ORG_URL_PREFIX}    server          1.2.2-mga9   postgres       -            8032    5432    -       -       983            981
+
+
+
+#-------------------------------------------------------------------------------
+# Database
+#-------------------------------------------------------------------------------
+
+POSTGRESQL_POSTGRES_PASSWORD="postgresadmin"
+POSTGRESQL_DATABASE="test"
+POSTGRESQL_USER="test"
+POSTGRESQL_PASSWORD="testadmin"

var/lib/pgsql/.gitignore

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

var/log/init/.gitignore

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

var/log/postgres/.gitignore

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

var/log/supervisor/.gitignore

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