From 7759288a0ffa6462c14f37350736a0a998511b42 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Wed, 3 Jun 2015 14:41:02 -0400 Subject: [PATCH] cleanly shutdown postgres before exiting the container --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 7fecf56b50..5203421cf6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -14,8 +14,8 @@ RUN apt-get install -y mg vim tmux git mercurial subversion python-dev python-pi RUN git clone http://d7f73f8614295715a4777bf15f46d0d486ad0e21:x-oauth-basic@github.com/ansible/ansible-commander.git tower RUN pip install Django==1.6.7 django-devserver django-debug-toolbar django-jenkins ipython ansible pymongo==2.8 mongoengine RUN cd /tower ; make develop -RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_user -U postgres -a "name=awx-dev password=AWXsome1 login_user=postgres" all' -RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_db -U postgres -a "name=awx-dev owner=awx-dev login_user=postgres" all' +RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_user -U postgres -a "name=awx-dev password=AWXsome1 login_user=postgres" all'; /etc/init.d/postgresql stop +RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_db -U postgres -a "name=awx-dev owner=awx-dev login_user=postgres" all'; /etc/init.d/postgresql stop RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa ADD local_settings.py /tower/awx/settings/local_settings.py RUN mkdir -p /etc/tower