remove postgres from docker

diff --git a/Dockerfile b/Dockerfile
index 517b300a9ebd31249c97f7f3a249e9a3aea25d67..98ba9a4ea4c0cbd238a3785f28fd8a8c280bfb39 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,11 @@ maintainer Guillaume Pellerin <yomguy@parisson.com>
 
 # install confs, keys and deps
 add ./deploy/apt-app.list /etc/apt/sources.list.d/
-#run apt-key adv --keyserver pgpkeys.mit.edu --recv-keys DF14BB7C
-#run apt-key adv --keyserver pgpkeys.mit.edu --recv-keys 1F41B907
+run apt-get install -y apt-utils
+run gpg --keyserver pgpkeys.mit.edu --recv-key E3298399DF14BB7C
+run gpg -a --export E3298399DF14BB7C | apt-key add -
+run gpg --keyserver pgpkeys.mit.edu --recv-key 07DC563D1F41B907
+run gpg -a --export 07DC563D1F41B907 | apt-key add -
 run apt-get update
 run apt-get install -y --force-yes apt-utils
 run apt-get -y --force-yes -t wheezy-backports dist-upgrade
@@ -33,16 +36,6 @@ run pip install uwsgi ipython
 # clone app
 add . /opt/TimeSide
 
-# setup postgresql DB
-volume  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
-user postgres
-run /etc/init.d/postgresql start &&\
-       psql --command "CREATE USER docker WITH SUPERUSER; &&\
-       psql --command "ALTER USER WITH PASSWORD 'docker';" &&\
-       psql --command "CREATE DATABASE timeside;" &&\
-       psql --command "ALTER DATABASE timeside OWNER TO docker;"
-user root
-
 # setup all the configfiles
 run echo "daemon off;" >> /etc/nginx/nginx.conf
 run rm /etc/nginx/sites-enabled/default
@@ -56,8 +49,8 @@ run pip install -e /opt/TimeSide
 run echo "export PYTHONPATH=$PYTHONPATH:/opt/Timeside" >> ~/.bashrc
 
 # sandbox setup
-run /etc/init.d/postgresql start && /opt/TimeSide/examples/sandbox/manage.py syncdb --noinput
-run /etc/init.d/postgresql start && /opt/TimeSide/examples/sandbox/manage.py migrate --noinput
+run /opt/TimeSide/examples/sandbox/manage.py syncdb --noinput
+run /opt/TimeSide/examples/sandbox/manage.py migrate --noinput
 run /opt/TimeSide/examples/sandbox/manage.py collectstatic --noinput
 
 expose 80

diff --git a/deploy/supervisor-app.conf b/deploy/supervisor-app.conf
index b0f52ad58baff8d9a4f114cfbca7e859cf1291ed..86471e361bfd8b8c31e4ebc5b40ef4d74c9fcb80 100644 (file)
--- a/deploy/supervisor-app.conf
+++ b/deploy/supervisor-app.conf
@@ -1,6 +1,3 @@
-[program:postgresql-app]
-command = postgresql -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf
-
 [program:app-uwsgi]
 command = /usr/local/bin/uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini