mirror of
https://github.com/ansible/awx.git
synced 2026-01-10 15:32:07 -03:30
Replace tini with dumb-init
dumb-init is more actively maintained, available on pypi, and already used for both upstream and downstream EEs
This commit is contained in:
parent
dbdc529d4a
commit
39905b33cd
@ -120,11 +120,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master
|
||||
chmod 700 get_helm.sh && \
|
||||
./get_helm.sh
|
||||
|
||||
# Install tini
|
||||
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 pip3 install virtualenv supervisor dumb-init
|
||||
|
||||
RUN rm -rf /root/.cache && rm -rf /tmp/*
|
||||
|
||||
@ -293,7 +289,7 @@ CMD ["/bin/bash"]
|
||||
USER 1000
|
||||
EXPOSE 8052
|
||||
|
||||
ENTRYPOINT ["/usr/bin/tini", "--"]
|
||||
ENTRYPOINT ["dumb-init", "--"]
|
||||
CMD /usr/bin/launch_awx.sh
|
||||
VOLUME /var/lib/nginx
|
||||
VOLUME /var/lib/awx/.local/share/containers
|
||||
|
||||
@ -5,4 +5,4 @@ bootstrap_development.sh
|
||||
|
||||
cd /awx_devel
|
||||
# Start the services
|
||||
exec tini -- make supervisor
|
||||
exec make supervisor
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user