zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace tini with dumb-init

Browse Source 
dumb-init is more actively maintained, available on pypi, and already used for both upstream and downstream EEs
This commit is contained in:
Shane McDonald
2022-03-28 08:57:18 -04:00
parent dbdc529d4a
commit 39905b33cd
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ansible/roles/dockerfile/templates/Dockerfile.j2
View File

@@ -120,11 +120,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master
chmod 700 get_helm.sh && \ chmod 700 get_helm.sh && \
./get_helm.sh ./get_helm.sh
# Install tini RUN pip3 install virtualenv supervisor dumb-init
RUN curl -L -o /usr/bin/tini https://github.com/krallin/tini/releases/download/v0.19.0/tini-{{ tini_architecture | default('amd64') }} && \
chmod +x /usr/bin/tini
RUN pip3 install virtualenv supervisor
RUN rm -rf /root/.cache && rm -rf /tmp/* RUN rm -rf /root/.cache && rm -rf /tmp/*
@@ -293,7 +289,7 @@ CMD ["/bin/bash"]
USER 1000 USER 1000
EXPOSE 8052 EXPOSE 8052
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["dumb-init", "--"]
CMD /usr/bin/launch_awx.sh CMD /usr/bin/launch_awx.sh
VOLUME /var/lib/nginx VOLUME /var/lib/nginx
VOLUME /var/lib/awx/.local/share/containers VOLUME /var/lib/awx/.local/share/containers

2
tools/docker-compose/launch_awx.sh
View File

@@ -5,4 +5,4 @@ bootstrap_development.sh
cd /awx_devel cd /awx_devel
# Start the services # Start the services
exec tini -- make supervisor exec make supervisor