- 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.
This commit is contained in:
113
Dockerfile
113
Dockerfile
@@ -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_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_DATA=${POSTGRESQL_LIB}/data
|
||||
ARG POSTGRESQL_PORT=5432
|
||||
ARG POSTGRESQL_LIB
|
||||
ARG POSTGRESQL_DATA
|
||||
ARG POSTGRESQL_PORT
|
||||
ARG POSTSQL_LOG_DIR
|
||||
|
||||
ARG POSTSQL_LOG_FILE="${POSTSQL_LOG_DIR}/postsql.log"
|
||||
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
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\
|
||||
sed -i "s/#port = 5432/listen_addresses=`*`\\n#port = 5432/" '${POSTGRESQL_DATA}'/postgresql.conf \n\
|
||||
fi'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG POSTGRESQLD_INI='[program:postgresqld] \n\
|
||||
command=/usr/bin/postgres -D '${POSTGRESQL_DATA}' -p '${POSTGRESQL_PORT}' \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\
|
||||
\n\
|
||||
log "Starting" \n\
|
||||
\n\
|
||||
for i in {30..0} \n\
|
||||
do \n\
|
||||
if psql --username=postgres <<< "SELECT 1" &> /dev/null \n\
|
||||
then \n\
|
||||
break \n\
|
||||
fi \n\
|
||||
\n\
|
||||
sleep 1 \n\
|
||||
done \n\
|
||||
\n\
|
||||
if [ "$i" = 0 ] \n\
|
||||
then \n\
|
||||
log "Unable to connect server" \n\
|
||||
else \n\
|
||||
while read line \n\
|
||||
do \n\
|
||||
log "Executing: [${line}]" \n\
|
||||
echo ${line} | psql --username=postgres \n\
|
||||
done < /tmp/post.sql \n\
|
||||
fi \n\
|
||||
\n\
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG POSTSQL='#!/bin/bash \n\
|
||||
\n\
|
||||
function log() { echo "$(date --rfc-3339=ns) PostSQL: $*" | tee -a '${POSTSQL_LOG_FILE}'; } \n\
|
||||
\n\
|
||||
log "Starting" \n\
|
||||
\n\
|
||||
for i in {30..0} \n\
|
||||
do \n\
|
||||
if psql --username=postgres <<< "SELECT 1" &> /dev/null \n\
|
||||
then \n\
|
||||
break \n\
|
||||
fi \n\
|
||||
\n\
|
||||
sleep 1 \n\
|
||||
done \n\
|
||||
\n\
|
||||
if [ "$i" = 0 ] \n\
|
||||
then \n\
|
||||
log "Unable to connect server" \n\
|
||||
else \n\
|
||||
while read line \n\
|
||||
do \n\
|
||||
log "Executing: [${line}]" \n\
|
||||
echo ${line} | psql --username=postgres \n\
|
||||
done < /tmp/post.sql \n\
|
||||
fi \n\
|
||||
\n\
|
||||
log "Completed"'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG POSTSQL_INI='[program:postsql] \n\
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG POSTSQL_INI='[program:postsql] \n\
|
||||
command=/usr/local/sbin/postsql'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
#-----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
RUN 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 \
|
||||
&& 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 \
|
||||
&& chmod a+x /usr/local/sbin/postsql \
|
||||
&& echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini
|
||||
RUN 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 \
|
||||
&& 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 \
|
||||
&& chmod a+x /usr/local/sbin/postsql \
|
||||
&& echo -e "${POSTSQL_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postsql.ini
|
||||
|
||||
|
||||
VOLUME /var/lib/pgsql
|
||||
VOLUME ${POSTGRESQL_LIB}
|
||||
|
||||
EXPOSE 5432
|
||||
|
||||
Reference in New Issue
Block a user