External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Apply to all Dockerfiles and use the preferred ENTRYPOINT form.

Browse Source
This commit is contained in:
Joshua "jag" Ginsberg
2016-01-25 16:58:04 -05:00
parent df072c1a6f
commit 16c6f93aa2
2 changed files with 4 additions and 1 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/awx/license
ADD license /etc/tower/license ADD license /etc/tower/license
RUN pip2 install honcho 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 ADD start_development.sh /start_development.sh
EXPOSE 8013 8080 22 EXPOSE 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"]
CMD /start_development.sh CMD /start_development.sh

2
tools/docker/Dockerfile
View File

@@ -32,5 +32,5 @@ ADD start_everything.sh /start_everything.sh
ADD start_development.sh /start_development.sh ADD start_development.sh /start_development.sh
EXPOSE 8013 8080 27017 22 EXPOSE 8013 8080 27017 22
ENTRYPOINT /usr/bin/dumb-init ENTRYPOINT ["/usr/bin/dumb-init"]
CMD /start_development.sh CMD /start_development.sh