wassname/docker-postgresql
1
0
Fork 0
mirror of https://github.com/wassname/docker-postgresql.git synced 2026-09-09 11:21:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile: added PG_RUNDIR variable

Browse Source
This commit is contained in:
Sameer Naik
2015-08-16 12:12:30 +05:30
parent 17c826882a
commit 3c5e076101
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+3 -2
View File
@@ -3,7 +3,8 @@ MAINTAINER sameer@damagehead.com
ENV PG_VERSION=9.4 \ ENV PG_VERSION=9.4 \
PG_USER=postgres \ PG_USER=postgres \
PG_HOME="/var/lib/postgresql" PG_HOME=/var/lib/postgresql \
PG_RUNDIR=/run/postgresql
ENV PG_CONFDIR="/etc/postgresql/${PG_VERSION}/main" \ ENV PG_CONFDIR="/etc/postgresql/${PG_VERSION}/main" \
PG_BINDIR="/usr/lib/postgresql/${PG_VERSION}/bin" \ PG_BINDIR="/usr/lib/postgresql/${PG_VERSION}/bin" \
@@ -20,5 +21,5 @@ COPY entrypoint.sh /sbin/entrypoint.sh
RUN chmod 755 /sbin/entrypoint.sh RUN chmod 755 /sbin/entrypoint.sh
EXPOSE 5432/tcp EXPOSE 5432/tcp
VOLUME ["${PG_HOME}", "/run/postgresql"] VOLUME ["${PG_HOME}", "${PG_RUNDIR}"]
CMD ["/sbin/entrypoint.sh"] CMD ["/sbin/entrypoint.sh"]
entrypoint.sh
+4 -4
View File
@@ -42,10 +42,10 @@ chown -R ${PG_USER}:${PG_USER} ${PG_CONFDIR}
mkdir -p -m 0700 ${PG_HOME} mkdir -p -m 0700 ${PG_HOME}
chown -R ${PG_USER}:${PG_USER} ${PG_HOME} chown -R ${PG_USER}:${PG_USER} ${PG_HOME}
# fix permissions and ownership of /run/postgresql # fix permissions and ownership of ${PG_RUNDIR}
mkdir -p -m 0755 /run/postgresql /run/postgresql/${PG_VERSION}-main.pg_stat_tmp mkdir -p -m 0755 ${PG_RUNDIR} ${PG_RUNDIR}/${PG_VERSION}-main.pg_stat_tmp
chown -R ${PG_USER}:${PG_USER} /run/postgresql chown -R ${PG_USER}:${PG_USER} ${PG_RUNDIR}
chmod g+s /run/postgresql chmod g+s ${PG_RUNDIR}
if [[ ${PSQL_SSLMODE} == disable ]]; then if [[ ${PSQL_SSLMODE} == disable ]]; then
sed 's/ssl = true/#ssl = true/' -i ${PG_CONFDIR}/postgresql.conf sed 's/ssl = true/#ssl = true/' -i ${PG_CONFDIR}/postgresql.conf