Skip to content

Commit ae280f3

Browse files
sij411claude
andcommitted
Pin Caddy images, add healthchecks, and fix sidekiq dependency
- Pin Caddy images to 2.11.2-alpine for reproducible CI builds - Add healthchecks to caddy-harness and caddy-mastodon so docker compose --wait blocks until proxies are ready - Make mastodon-sidekiq depend on caddy-harness (instead of fedify-harness-backend directly) to ensure TLS proxy is ready before Sidekiq attempts HTTPS deliveries Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 9fc7c4f commit ae280f3

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

test/smoke/mastodon/docker-compose.strict.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ services:
7878
# Caddy TLS proxy for the Fedify harness.
7979
# Owns the "fedify-harness" hostname so other containers reach TLS.
8080
caddy-harness:
81-
image: caddy:2-alpine
81+
image: caddy:2.11.2-alpine
8282
volumes:
8383
- ./Caddyfile.fedify-harness:/etc/caddy/Caddyfile:ro
8484
- ./.certs:/certs:ro
@@ -87,6 +87,10 @@ services:
8787
aliases: [fedify-harness]
8888
depends_on:
8989
fedify-harness-backend: { condition: service_healthy }
90+
healthcheck:
91+
test: ["CMD", "caddy", "version"]
92+
interval: 5s
93+
retries: 5
9094

9195
# Mastodon web — renamed to avoid colliding with the Caddy alias.
9296
mastodon-web-backend:
@@ -120,7 +124,7 @@ services:
120124
# Caddy TLS proxy for Mastodon.
121125
# Owns the "mastodon" hostname so other containers reach TLS.
122126
caddy-mastodon:
123-
image: caddy:2-alpine
127+
image: caddy:2.11.2-alpine
124128
volumes:
125129
- ./Caddyfile.mastodon:/etc/caddy/Caddyfile:ro
126130
- ./.certs:/certs:ro
@@ -130,6 +134,10 @@ services:
130134
ports: ["4443:443"]
131135
depends_on:
132136
mastodon-web-backend: { condition: service_healthy }
137+
healthcheck:
138+
test: ["CMD", "caddy", "version"]
139+
interval: 5s
140+
retries: 5
133141

134142
mastodon-sidekiq:
135143
image: ghcr.io/mastodon/mastodon:v4.3.9
@@ -148,4 +156,4 @@ services:
148156
networks: [smoke]
149157
depends_on:
150158
mastodon-web-backend: { condition: service_healthy }
151-
fedify-harness-backend: { condition: service_healthy }
159+
caddy-harness: { condition: service_healthy }

0 commit comments

Comments
 (0)