From 9e585c618a23e2d75e5f34f682aebec2c357e9f3 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Tue, 6 May 2025 14:28:09 -0700 Subject: [PATCH] Provide default entrypoint for the cloud-ess-fips image In order to match the pattern for the other Cloud ESS image, provide a default entrypoint to the container that points to the configured docker entrypoint. This is described in https://github.com/elastic/elasticsearch/blob/1a1763c591c4c32bf66f0df3bce2040e8f19a1a2/distribution/docker/README.md?plain=1#L16-L19 and implemented in https://github.com/elastic/elasticsearch/blob/1a1763c591c4c32bf66f0df3bce2040e8f19a1a2/distribution/docker/src/docker/Dockerfile.ess#L37-L40 --- distribution/docker/src/docker/Dockerfile.ess-fips | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/distribution/docker/src/docker/Dockerfile.ess-fips b/distribution/docker/src/docker/Dockerfile.ess-fips index 6081edf038860..27f03a40a056f 100644 --- a/distribution/docker/src/docker/Dockerfile.ess-fips +++ b/distribution/docker/src/docker/Dockerfile.ess-fips @@ -208,6 +208,11 @@ LABEL name="Elasticsearch" \\ RUN mkdir /licenses && ln LICENSE.txt /licenses/LICENSE +# Generate a stub command that will be overwritten at runtime +RUN mkdir /app && \\ + echo -e '#!/bin/bash\\nexec /usr/local/bin/docker-entrypoint.sh eswrapper' > /app/elasticsearch.sh && \\ + chmod 0555 /app/elasticsearch.sh + ENTRYPOINT ["/sbin/tini", "--"] CMD ["/app/elasticsearch.sh"]