working, working...

postgres/Dockerfile

@@ -18,9 +18,6 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/
 #  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
 
-# ...
-#RUN mkdir -p /data/main && chown -R postgres:postgres /data/main
-
 # Note: The official Debian and Ubuntu images automatically ``apt-get clean``
 # after each ``apt-get``
 # Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
@@ -46,7 +43,7 @@ RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf
 EXPOSE 5432
 
 # Add VOLUMEs to allow backup of config, logs and databases
-VOLUME  ["/var/lib/postgresql/9.3/main"]
+VOLUME  ["/var/lib/postgresql/"]
 
 # Set the default command to run when starting the container
-CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/etc/postgresql/9.3/main/"]
+ENTRYPOINT ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/etc/postgresql/9.3/main/"]

quassel_docker.sh

@@ -10,8 +10,10 @@ quassel_container="$project_name-quassel"
 # postgres data dir
 pgdata="`pwd`/postgres/data"
 
+# prep work
+
 # postgres docker
-runpostgres="docker run -h $postgres_container --name $postgres_container -v $pgdata:/var/lib/postgresql/9.3/main/ --rm $postgres_image"
+runpostgres="docker run -h $postgres_container --name $postgres_container -v $pgdata:/var/lib/postgresql/ --rm $postgres_image"
 
 # quassel docker
 runquassel="docker run -h $quassel_container --link=$quassel_container:$postgres_container --name $quassel_container --rm $quassel_image"