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

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

Dockerfile

@@ -16,10 +16,11 @@ LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 ARG POSTGRESQL_LIB
-ARG POSTGRESQL_DATA
+ARG POSTGRESQL_LOG
 ARG POSTGRESQL_PORT
 ARG POSTSQL_LOG_DIR
 
+ARG POSTGRESQL_DATA="${POSTGRESQL_LIB}/data"
 ARG POSTSQL_LOG_FILE="${POSTSQL_LOG_DIR}/postsql.log"
 
 
@@ -47,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\
@@ -103,7 +105,8 @@ 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                                                          \
@@ -114,5 +117,6 @@ RUN    urpmi --force postgresql15 postgresql15-server postgresql15-pl
 
 
 VOLUME ${POSTGRESQL_LIB}
+VOLUME ${POSTGRESQL_LOG}
 
-EXPOSE 5432
+EXPOSE ${POSTGRESQL_PORT}

ReadMe.txt

@@ -5,7 +5,7 @@ Welcome to Rx3-Docker/PostgreSQL docker image!
 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,

ReleaseNotes.txt

@@ -1,5 +1,30 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/PostgreSQL-Mga9 V 1.1.0 - A. GIBERT - 2024/11/12
+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,

compose.yaml

@@ -1,52 +1,53 @@
 # Rx3-Docker/PostgreSQL Docker Image
 #-------------------------------------------------------------------------------
 
-name:                           ${IMG_NAME}
+name:                               ${DATABASE_IMG_NAME}
 
 services:
 
   database:
-    container_name:             ${IMG_NAME}
-    hostname:                   ${IMG_NAME}
-
-    image:                      ${IMG_URL}
+    container_name:                 ${DATABASE_IMG_NAME}
+    hostname:                       ${DATABASE_IMG_NAME}
+    
+    image:                          ${DATABASE_IMG_URL}
 
     build:
-      context:                  .
+      context:                      .
       args:
-        IMG_NAME:               ${IMG_NAME}
-        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        IMG_VERSION:            ${IMG_VERSION}
-        IMG_MAINTAINER:         ${IMG_MAINTAINER}
-        IMG_FROM_URL:           ${IMG_FROM_URL}
+        IMG_NAME:                   ${DATABASE_IMG_NAME}
+        IMG_NAME_FULL:              ${DATABASE_IMG_NAME_FULL}
+        IMG_VERSION:                ${DATABASE_IMG_VERSION}
+        IMG_MAINTAINER:             ${DATABASE_IMG_MAINTAINER}
+        IMG_FROM_URL:               ${DATABASE_IMG_FROM_URL}
 
-        POSTGRESQL_LIB:         ${DATABASE_LIB_DIR}
-        POSTGRESQL_DATA:        ${DATABASE_DATA_DIR}
-        POSTGRESQL_PORT:        ${DATABASE_PORT_MAIN_INT}
-        POSTSQL_LOG_DIR:        ${DATABASE_LOG_POSTSQL_DIR}
+        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
+    restart:                        unless-stopped
     
     environment:
-      POSTGRESQL_UID:               ${POSTGRESQL_UID}
-      POSTGRESQL_GID:               ${POSTGRESQL_GID}
+      POSTGRESQL_UID:               ${DATABASE_USER_ID}
+      POSTGRESQL_GID:               ${DATABASE_GROUP_ID}
+      
       POSTGRESQL_POSTGRES_PASSWORD: ${POSTGRESQL_POSTGRES_PASSWORD}
       POSTGRESQL_DATABASE:          ${POSTGRESQL_DATABASE}
       POSTGRESQL_USER:              ${POSTGRESQL_USER}
       POSTGRESQL_PASSWORD:          ${POSTGRESQL_PASSWORD}
       
     healthcheck:
-      test: ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE}'"]
-      interval: 10s
-      timeout: 3s
-      retries: 3
+      test:                         ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRESQL_USER} -d ${POSTGRESQL_DATABASE}'"]
+      interval:                     10s
+      timeout:                      3s
+      retries:                      3
       
     volumes:
-      - ./var/lib/pgsql/data:/var/lib/pgsql/data
-      - ./var/log/init:${DATABASE_LOG_INIT_DIR}
-      - ./var/log/supervisor:${DATABASE_LOG_SV_DIR}
-      - ./var/log/postgres:${DATABASE_LOG_POSTGRES_DIR}
-
+      - ./${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:${DATABASE_PORT_SV_EXT}:${DATABASE_PORT_SV_INT}"
       - "127.0.0.1:${DATABASE_PORT_MAIN_EXT}:${DATABASE_PORT_MAIN_INT}"

env.dist

@@ -7,6 +7,7 @@
 
 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}"
 
@@ -16,40 +17,38 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_NAME="postgresql"
-IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
-IMG_VERSION="1.1.0-mga9"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+HOST_NAME_PREFIX=""
 
-IMG_URL_PREFIX="${ORG_URL_PREFIX}"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+PORT_ENV_OFFSET=0
 
-IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
+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
 
 
 
 #-------------------------------------------------------------------------------
-# User Settings
+# Database
 #-------------------------------------------------------------------------------
 
-ENV_PORT_OFFSET=0
-SV_PORT_OFFSET=1000
-
-DATABASE_PORT_MAIN_EXT=$(( 8032 + ${ENV_PORT_OFFSET}))
-DATABASE_PORT_MAIN_INT=5432
-
-DATABASE_PORT_SV_EXT=$(( ${DATABASE_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
-DATABASE_PORT_SV_INT=9001
-
-DATABASE_LIB_DIR="/var/lib/pgsql"
-DATABASE_DATA_DIR="${DATABASE_LIB_DIR}/data"
-DATABASE_LOG_INIT_DIR="/var/log/init"
-DATABASE_LOG_SV_DIR="/var/log/supervisor"
-DATABASE_LOG_POSTGRES_DIR="/var/log/postgres"
-DATABASE_LOG_POSTSQL_DIR="${DATABASE_LOG_SV_DIR}"
-
-POSTGRESQL_UID=971
-POSTGRESQL_GID=971
 POSTGRESQL_POSTGRES_PASSWORD="postgresadmin"
 POSTGRESQL_DATABASE="test"
 POSTGRESQL_USER="test"