Skip to content

Commit

Permalink
ironbank: enable /usr/bin/tini (elastic#3861)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Dec 5, 2023
1 parent 8082519 commit 2c04c13
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions dev-tools/packaging/templates/ironbank/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ COPY LICENSE /licenses/elastic-${ELASTIC_PRODUCT}
# Add a dumb init process
COPY tinit /tinit
RUN chmod +x /tinit
# Help with supporting the override in the ECK entrypoint
# https://github.com/elastic/cloud-on-k8s/blob/272fd0f2b344b1f86f04decb561eceab8a5a3254/pkg/controller/agent/pod.go#L455
# TODO: eventually /tinit will be replaced by /usr/bin/tini
RUN ln -s /tinit /usr/bin/tini

# Bring in product from the initial stage.
COPY --from=prep_files --chown=1000:0 /usr/share/${ELASTIC_PRODUCT} /usr/share/${ELASTIC_PRODUCT}
Expand Down Expand Up @@ -84,6 +88,7 @@ RUN chmod 755 /usr/local/bin/docker-entrypoint
USER ${ELASTIC_PRODUCT}
ENV ELASTIC_PRODUCT=${ELASTIC_PRODUCT}

# TODO: eventually /tinit will be replaced by /usr/bin/tini
ENTRYPOINT ["/tinit", "--", "/usr/local/bin/docker-entrypoint"]
CMD [""]

Expand Down

0 comments on commit 2c04c13

Please sign in to comment.