From 2742fa39aab05ed2f8ef085796fee8fcc5534bab Mon Sep 17 00:00:00 2001 From: Benno Evers Date: Thu, 23 May 2024 17:42:03 +0200 Subject: [PATCH] Fix entrypoints for docker images (#4) --- components/dex/Dockerfile | 9 ++++----- components/seaweed/Dockerfile | 9 ++++----- examples/onprem-integrated/docker-compose.yaml | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/components/dex/Dockerfile b/components/dex/Dockerfile index 8e474d2..c35a980 100644 --- a/components/dex/Dockerfile +++ b/components/dex/Dockerfile @@ -1,11 +1,10 @@ -# A fork of the upstream dex container that -# allows configuring the initial user and -# password via environment variables, by writing a -# config file to `/etc/dex/tenzir-config.yaml` +# A fork of the upstream dex container that allows configuring the initial +# user and password via environment variables, by writing a config file +# to `/etc/dex/tenzir-config.yaml` FROM dexidp/dex:v2.38.0 COPY dex.tenzir-entrypoint.sh /tenzir-entrypoint.sh -ENTRYPOINT /tenzir-entrypoint.sh +ENTRYPOINT ["/tenzir-entrypoint.sh"] diff --git a/components/seaweed/Dockerfile b/components/seaweed/Dockerfile index a265b49..2f7da4c 100644 --- a/components/seaweed/Dockerfile +++ b/components/seaweed/Dockerfile @@ -1,11 +1,10 @@ -# A fork of the official seaweed container that -# allows configuring the bucket name and access -# keys via environment variables, by writing a -# config file to `/config.json` +# A fork of the official seaweed container that allows configuring the bucket +# name and access keys via environment variables, by writing a config file +# to `/config.json` FROM chrislusf/seaweedfs COPY seaweed.tenzir-entrypoint.sh /tenzir-entrypoint.sh -ENTRYPOINT /tenzir-entrypoint.sh +ENTRYPOINT ["/tenzir-entrypoint.sh"] diff --git a/examples/onprem-integrated/docker-compose.yaml b/examples/onprem-integrated/docker-compose.yaml index 9ccdc60..4ce9ee6 100644 --- a/examples/onprem-integrated/docker-compose.yaml +++ b/examples/onprem-integrated/docker-compose.yaml @@ -97,7 +97,7 @@ services: # Note the ~25 seconds startup delay before the seaweed server # becomes ready. seaweed: - image: ghcr.io/tenzir/tenzir-seaweedfs:${TENZIR_PLATFORM_VERSION:-latest} + image: ghcr.io/tenzir/tenzir-seaweed:${TENZIR_PLATFORM_VERSION:-latest} restart: unless-stopped environment: - TENZIR_PLATFORM_INTERNAL_ACCESS_KEY_ID