summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoshua "jag" Ginsberg <jag@flowtheory.net>2016-01-25 22:01:53 +0100
committerJoshua "jag" Ginsberg <jag@flowtheory.net>2016-01-25 22:01:53 +0100
commitdf072c1a6f7dd0686d261f7f6d1659d270db8d52 (patch)
treed1b46056e34791b683026d5b5e4604e1a15fecd5 /tools
parentMerge pull request #677 from jlmitch5/sprint1UIFixes (diff)
downloadawx-df072c1a6f7dd0686d261f7f6d1659d270db8d52.tar.xz
awx-df072c1a6f7dd0686d261f7f6d1659d270db8d52.zip
Initial attempt at dumb-init
Diffstat (limited to 'tools')
-rw-r--r--tools/docker/Dockerfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index f90618f97d..4f8cc1e109 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -26,8 +26,11 @@ ADD license /etc/awx/license
ADD license /etc/tower/license
RUN pip2 install honcho
RUN /etc/init.d/postgresql start; cd /tower ; make migrate ; make init ; /etc/init.d/postgresql stop
+RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.0/dumb-init_1.0.0_amd64.deb
+RUN dpkg -i dumb-init_*.deb
ADD start_everything.sh /start_everything.sh
ADD start_development.sh /start_development.sh
EXPOSE 8013 8080 27017 22
+ENTRYPOINT /usr/bin/dumb-init
CMD /start_development.sh