summaryrefslogtreecommitdiffstats
path: root/Services/postgres
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
committerstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
commit1af7a22460dafe12f22f9b564d946f3d583f4cb0 (patch)
tree3d13d49ba4f5d6ac8cb4532435898b911bdf5a02 /Services/postgres
parentb502829a772adb36d4786db369aa4d803eb7877c (diff)
downloadphpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.gz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.bz2
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.xz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.zip
debuging images and improve startup display
Diffstat (limited to 'Services/postgres')
-rw-r--r--Services/postgres/Dockerfile3
-rw-r--r--Services/postgres/README.md4
-rw-r--r--Services/postgres/docker-compose.yml2
-rw-r--r--Services/postgres/run.sh6
4 files changed, 8 insertions, 7 deletions
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index a8da28e..22e5761 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -15,7 +15,8 @@ RUN chmod 775 /bin/run.sh && \
mkdir -p $DATA_PATH && \
mkdir -p $LOG_PATH && \
touch $STARTUPLOG && \
- chown -R postgres:postgres $LOG_PATH $DATA_PATH $LOADSQL_PATH
+ chown -R postgres:postgres $LOG_PATH $DATA_PATH $LOADSQL_PATH $STARTUPLOG && \
+ chmod -R 0700 $DATA_PATH
EXPOSE 5432
VOLUME [$DATA_PATH,$LOG_PATH]
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index b190098..1051fe1 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -18,8 +18,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + PostgreSQL
-* `:fc23` : Fedora core 23 + PostgreSQL
+* `:latest` : Fedora core 23 + PostgreSQL 9.4.5
+* `:fc23` : Fedora core 23 + PostgreSQL 9.4.5
* `:fc22` : Fedora core 22 + PostgreSQL
* `:fc21` : Fedora core 21 + PostgreSQL
* `:centos7` : CentOS 7 + PostgreSQL
diff --git a/Services/postgres/docker-compose.yml b/Services/postgres/docker-compose.yml
index 26d502a..ac008c4 100644
--- a/Services/postgres/docker-compose.yml
+++ b/Services/postgres/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 8
restart: "on-failure:2"
ports:
- - "5432:5432"
+ - "9241:5432"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "postgresql"
diff --git a/Services/postgres/run.sh b/Services/postgres/run.sh
index e5a70ec..ff4145d 100644
--- a/Services/postgres/run.sh
+++ b/Services/postgres/run.sh
@@ -21,12 +21,12 @@ function display_container_postgresql_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v DATA_PATH ]; then
echo "| Data path : $DATA_PATH"
fi