Rx3-Docker/postgresql
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

- Move & Rename repo from Rx3/PostgreSQL-MGA9 to Rx3-Docker/PostgreSQL,

Browse Source 
- 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.
This commit is contained in:
Arnaud G. GIBERT 2024-11-12 17:02:53 +01:00
parent 4d46bd66d3
commit f2517f786d
8 changed files with 129 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
Dockerfile
View File

@ -1,23 +1,28 @@
# 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.3 FROM ${IMG_FROM_URL}
ARG IMG_NAME ARG IMG_NAME
ARG IMG_FULL_NAME ARG IMG_NAME_FULL
ARG IMG_VERSION ARG IMG_VERSION
ARG IMG_MAINTAINER 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}.version=${IMG_VERSION}
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER}
ARG POSTGRESQL_LIB=/var/lib/pgsql ARG POSTGRESQL_LIB
ARG POSTGRESQL_DATA=${POSTGRESQL_LIB}/data ARG POSTGRESQL_DATA
ARG POSTGRESQL_PORT=5432 ARG POSTGRESQL_PORT
ARG POSTSQL_LOG_DIR
ARG POSTSQL_LOG_FILE="${POSTSQL_LOG_DIR}/postsql.log"
#----------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
ARG POSTGRESQLD='#!/bin/bash \n\ ARG POSTGRESQLD='#!/bin/bash \n\
@ -52,62 +57,62 @@ then
echo "host all all 0.0.0.0/0 password" >>'${POSTGRESQL_DATA}'/pg_hba.conf \n\ 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\ sed -i "s/#port = 5432/listen_addresses=`*`\\n#port = 5432/" '${POSTGRESQL_DATA}'/postgresql.conf \n\
fi' fi'
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
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\
user=postgres' user=postgres'
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
ARG POSTSQL='#!/bin/bash \n\ ARG POSTSQL='#!/bin/bash \n\
\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\ \n\
log "Starting" \n\ log "Starting" \n\
\n\ \n\
for i in {30..0} \n\ for i in {30..0} \n\
do \n\ do \n\
if psql --username=postgres <<< "SELECT 1" &> /dev/null \n\ if psql --username=postgres <<< "SELECT 1" &> /dev/null \n\
then \n\ then \n\
break \n\ break \n\
fi \n\ fi \n\
\n\ \n\
sleep 1 \n\ sleep 1 \n\
done \n\ done \n\
\n\ \n\
if [ "$i" = 0 ] \n\ if [ "$i" = 0 ] \n\
then \n\ then \n\
log "Unable to connect server" \n\ log "Unable to connect server" \n\
else \n\ else \n\
while read line \n\ while read line \n\
do \n\ do \n\
log "Executing: [${line}]" \n\ log "Executing: [${line}]" \n\
echo ${line} | psql --username=postgres \n\ echo ${line} | psql --username=postgres \n\
done < /tmp/post.sql \n\ done < /tmp/post.sql \n\
fi \n\ fi \n\
\n\ \n\
log "Completed"' log "Completed"'
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
ARG POSTSQL_INI='[program:postsql] \n\ ARG POSTSQL_INI='[program:postsql] \n\
command=/usr/local/sbin/postsql' command=/usr/local/sbin/postsql'
#--------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------
RUN urpmi --force postgresql15 postgresql15-server postgresql15-pl \ RUN urpmi --force postgresql15 postgresql15-server postgresql15-pl \
&& echo -e "${POSTGRESQLD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/postgresqld \ && echo -e "${POSTGRESQLD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/postgresqld \
&& chmod a+x /etc/init.d/postgresqld \ && chmod a+x /etc/init.d/postgresqld \
&& ln -s /etc/init.d/postgresqld /etc/rcD.d/S30postgresqld \ && ln -s /etc/init.d/postgresqld /etc/rcD.d/S30postgresqld \
&& echo -e "${POSTGRESQLD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/postgresqld.ini \ && echo -e "${POSTGRESQLD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/postgresqld.ini \
&& echo -e "${POSTSQL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/postsql \ && echo -e "${POSTSQL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/postsql \
&& chmod a+x /usr/local/sbin/postsql \ && chmod a+x /usr/local/sbin/postsql \
&& echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini && echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini
VOLUME /var/lib/pgsql VOLUME ${POSTGRESQL_LIB}
EXPOSE 5432 EXPOSE 5432

6
ReadMe.txt
View File

@ -1,8 +1,8 @@
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: Features:
- Curtently based on rx3/server-mga9:1.1.2 image, - Curtently based on rx3/server-mga9:1.1.2 image,
@ -19,4 +19,4 @@ Your Rx3 Team.
-- --
arnaud@rx3.net arnaud@rx3.net
https://git.rx3.org/gitea/rx3/postgresql-mga9 https://git.rx3.org/gitea/rx3-docker/postgresql

7
ReleaseNotes.txt
View File

@ -1,7 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/PostgreSQL-Mga9 V 1.0.3 - A. GIBERT - 2024/11/xx Rx3/PostgreSQL-Mga9 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. - Add healthcheck example in compose file.

36
compose.yaml
View File

@ -1,23 +1,29 @@
# Rx3 PostgreSQL Mageia-9 Docker Image # Rx3-Docker/PostgreSQL Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_NAME} name: ${IMG_NAME}
services: services:
database: database:
container_name: ${IMG_NAME} container_name: ${IMG_NAME}
hostname: ${IMG_NAME}
image: ${IMG_URL} image: ${IMG_URL}
build: build:
context: . context: .
args: args:
- IMG_NAME=${IMG_NAME} IMG_NAME: ${IMG_NAME}
- IMG_FULL_NAME=${IMG_FULL_NAME} IMG_NAME_FULL: ${IMG_NAME_FULL}
- IMG_VERSION=${IMG_VERSION} IMG_VERSION: ${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER} IMG_MAINTAINER: ${IMG_MAINTAINER}
- IMG_URL_PREFIX=${IMG_URL_PREFIX} IMG_FROM_URL: ${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}
restart: unless-stopped restart: unless-stopped
@ -37,9 +43,11 @@ services:
volumes: volumes:
- ./var/lib/pgsql/data:/var/lib/pgsql/data - ./var/lib/pgsql/data:/var/lib/pgsql/data
- ./var/log/init:${DATABASE_LOG_INIT_DIR}
network_mode: bridge - ./var/log/supervisor:${DATABASE_LOG_SV_DIR}
- ./var/log/postgres:${DATABASE_LOG_POSTGRES_DIR}
ports: ports:
- "127.0.0.1:${DATABASE_SV_PORT}:9001" - "127.0.0.1:${DATABASE_PORT_SV_EXT}:${DATABASE_PORT_SV_INT}"
- "127.0.0.1:${DATABASE_PORT}:5432" - "127.0.0.1:${DATABASE_PORT_MAIN_EXT}:${DATABASE_PORT_MAIN_INT}"

35
env → env.dist
View File

@ -1,13 +1,14 @@
# Rx3 PostgreSQL Mageia-9 Docker Image # Rx3-Docker/PostgreSQL Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Global Settings # Global Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_ORG="rx3" ORG_NAME="rx3-docker"
IMG_REGISTRY="docker.xor.rx3:5000" ORG_REGISTRY="docker.xor.rx3:5000"
IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@ -15,12 +16,16 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
# Image Settings # Image Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_NAME="postgresql-mga9" IMG_NAME="postgresql"
IMG_FULL_NAME="Rx3 PostgreSQL Mageia-9 Docker Image" IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
IMG_VERSION="1.0.2" IMG_VERSION="1.1.0-mga9"
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>'
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -30,8 +35,18 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ENV_PORT_OFFSET=0 ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000 SV_PORT_OFFSET=1000
DATABASE_PORT=$(( 8032 + ${ENV_PORT_OFFSET})) DATABASE_PORT_MAIN_EXT=$(( 8032 + ${ENV_PORT_OFFSET}))
DATABASE_SV_PORT=$(( ${DATABASE_PORT} + ${SV_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_UID=971
POSTGRESQL_GID=971 POSTGRESQL_GID=971

4
var/log/init/.gitignore vendored Normal file
View File

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

4
var/log/postgres/.gitignore vendored Normal file
View File

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

4
var/log/supervisor/.gitignore vendored Normal file
View File

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