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

Swap out dumb-init for tini

Browse Source 
This seems to be less intrusive and less noisy of a pid 1
This commit is contained in:
Matthew Jones
2017-05-26 11:32:49 -04:00
parent 5232b70897
commit da5ef30b6a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/docker-compose/Dockerfile
View File

@@ -22,7 +22,6 @@ RUN mkdir -p /data/db
ADD tools/docker-compose/license /etc/tower/license ADD tools/docker-compose/license /etc/tower/license
RUN pip2 install honcho RUN pip2 install honcho
RUN pip2 install supervisor RUN pip2 install supervisor
RUN curl -LO https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 && chmod +x ./dumb-init_1.1.3_amd64 && mv ./dumb-init_1.1.3_amd64 /usr/bin/dumb-init
ADD tools/docker-compose/ansible-tower.egg-link /tmp/ansible-tower.egg-link ADD tools/docker-compose/ansible-tower.egg-link /tmp/ansible-tower.egg-link
ADD tools/docker-compose/tower-manage /usr/local/bin/tower-manage ADD tools/docker-compose/tower-manage /usr/local/bin/tower-manage
ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
@@ -38,7 +37,9 @@ RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
RUN chmod +x /tini
WORKDIR / WORKDIR /
EXPOSE 8043 8013 8080 22 EXPOSE 8043 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"] ENTRYPOINT ["/tini", "--"]
CMD /start_development.sh CMD /start_development.sh