External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #710 from ansible/jag/dumb-init

Browse Source 
Use dumb-init to manage processes in docker containers
This commit is contained in:
Matthew Jones
2016-01-29 10:15:00 -05:00
parent af65a88a0f 16c6f93aa2
commit 16a0d8b45d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/docker-compose/Dockerfile
View File

@@ -18,7 +18,10 @@ RUN mkdir -p /data/db
ADD license /etc/awx/license
ADD license /etc/tower/license
RUN pip2 install honcho
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_development.sh /start_development.sh
EXPOSE 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"]
CMD /start_development.sh

3
tools/docker/Dockerfile
View File

@@ -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