Skip to content

Commit

Permalink
Fix entrypoints for docker images (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
lava authored May 23, 2024
1 parent 39b1d44 commit 2742fa3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
9 changes: 4 additions & 5 deletions components/dex/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

9 changes: 4 additions & 5 deletions components/seaweed/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

2 changes: 1 addition & 1 deletion examples/onprem-integrated/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2742fa3

Please sign in to comment.