From 78f40be3d1007f2af8dbbfe749a9b0c590e7579e Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 14 Feb 2026 12:45:41 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. --- Dockerfile | 13 ++++++++++++- ReadMe.txt | 2 +- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 1 + env.dist | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5e06ef..9dce996 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -61,12 +62,16 @@ then fi' #----------------------------------------------------------------------------------------------------------------------------- + + #----------------------------------------------------------------------------------------------------------------------------- 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\ @@ -98,6 +103,8 @@ fi log "Completed"' #----------------------------------------------------------------------------------------------------------------------------- + + #----------------------------------------------------------------------------------------------------------------------------- ARG POSTSQL_INI='[program:postsql] \n\ command=/usr/local/sbin/postsql' @@ -105,7 +112,8 @@ command=/usr/local/sbin/postsql' -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && 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 \ @@ -116,7 +124,10 @@ RUN urpmi.update -a && echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini + VOLUME ${POSTGRESQL_LIB} VOLUME ${POSTGRESQL_LOG} + + EXPOSE ${POSTGRESQL_PORT} diff --git a/ReadMe.txt b/ReadMe.txt index 87b9bd0..e35c418 100644 --- a/ReadMe.txt +++ b/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-docker/server:1.2.7-mga9 image, + - Curtently based on postgresql 15.15 and rx3-docker/server:1.3.0-mga9 image, - Following env vars supported: - POSTGRESQL_UID & POSTGRESQL_GID, - POSTGRESQL_POSTGRES_PASSWORD, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index b9376c0..ab29ed8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PostgreSQL V 1.1.6 - A. GIBERT - 2026/02/14 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/server:1.3.0-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PostgreSQL V 1.1.5 - A. GIBERT - 2025/11/28 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index f9775e6..31b9cfd 100644 --- a/compose.yaml +++ b/compose.yaml @@ -18,6 +18,7 @@ services: IMG_NAME_FULL: ${DATABASE_IMG_NAME_FULL} IMG_VERSION: ${DATABASE_IMG_VERSION} IMG_MAINTAINER: ${DATABASE_IMG_MAINTAINER} + IMG_URL: ${DATABASE_IMG_URL} IMG_FROM_URL: ${DATABASE_IMG_FROM_URL} POSTGRESQL_LIB: ${DATABASE_LIB_INT} diff --git a/env.dist b/env.dist index f6e126d..bbf5d5d 100644 --- a/env.dist +++ b/env.dist @@ -41,7 +41,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" # | 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.5-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 postgres - 8032 5432 - - 983 981 +docker_service_add DATABASE database ${ORG_URL_PREFIX} postgresql "Rx3-Docker/PostgreSQL" 1.1.6-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 postgres - 8032 5432 - - 983 981