Merge branch 'main' into changelog-8.12

elastic · Dec 12, 2023 · b7f688c · b7f688c
2 parents 564ef7d + 6d7aa14
commit b7f688c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/packaging/ironbank/Dockerfile b/packaging/ironbank/Dockerfile
@@ -44,6 +44,9 @@ 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
+# 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}
@@ -68,6 +71,7 @@ RUN groupadd --gid 1000 ${ELASTIC_PRODUCT} && useradd --uid 1000 --gid 1000 --ho
 USER ${ELASTIC_PRODUCT}
 
 EXPOSE 8200
+# TODO: eventually /tinit will be replaced by /usr/bin/tini
 ENTRYPOINT ["/tinit", "--", "/usr/share/apm-server/apm-server"]
 CMD ["-environment", "container"]