Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions custom-domain/dstack-ingress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ You can use a wildcard domain (e.g. `*.myapp.com`) to route all subdomains to a
```yaml
services:
dstack-ingress:
image: dstacktee/dstack-ingress:2.0@sha256:9fb13c42dceaba91d2e2e7de3a06700a2cf507f4335ae70f3f1db4574a5ad552
image: dstacktee/dstack-ingress:2.1
ports:
- "443:443"
environment:
Expand Down Expand Up @@ -64,7 +64,7 @@ volumes:
```yaml
services:
dstack-ingress:
image: dstacktee/dstack-ingress:2.0@sha256:9fb13c42dceaba91d2e2e7de3a06700a2cf507f4335ae70f3f1db4574a5ad552
image: dstacktee/dstack-ingress:2.1
ports:
- "443:443"
environment:
Expand Down Expand Up @@ -102,7 +102,7 @@ Use `ROUTING_MAP` to route different domains to different backends via SNI:
```yaml
services:
ingress:
image: dstacktee/dstack-ingress:2.0@sha256:9fb13c42dceaba91d2e2e7de3a06700a2cf507f4335ae70f3f1db4574a5ad552
image: dstacktee/dstack-ingress:2.1
ports:
- "443:443"
environment:
Expand Down
2 changes: 1 addition & 1 deletion custom-domain/dstack-ingress/docker-compose.multi.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
ingress:
image: dstacktee/dstack-ingress:2.0@sha256:9fb13c42dceaba91d2e2e7de3a06700a2cf507f4335ae70f3f1db4574a5ad552
image: dstacktee/dstack-ingress:2.1
ports:
- "443:443"
environment:
Expand Down Expand Up @@ -36,5 +36,5 @@
restart: unless-stopped

volumes:
letsencrypt:

Check failure on line 39 in custom-domain/dstack-ingress/docker-compose.multi.yaml

View workflow job for this annotation

GitHub Actions / Basic Checks (dev.sh)

39:15 [empty-values] empty value in block mapping

Check failure on line 39 in custom-domain/dstack-ingress/docker-compose.multi.yaml

View workflow job for this annotation

GitHub Actions / check-all

39:15 [empty-values] empty value in block mapping
evidences:

Check failure on line 40 in custom-domain/dstack-ingress/docker-compose.multi.yaml

View workflow job for this annotation

GitHub Actions / Basic Checks (dev.sh)

40:13 [empty-values] empty value in block mapping

Check failure on line 40 in custom-domain/dstack-ingress/docker-compose.multi.yaml

View workflow job for this annotation

GitHub Actions / check-all

40:13 [empty-values] empty value in block mapping
2 changes: 1 addition & 1 deletion custom-domain/dstack-ingress/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
dstack-ingress:
image: dstacktee/dstack-ingress:2.0@sha256:9fb13c42dceaba91d2e2e7de3a06700a2cf507f4335ae70f3f1db4574a5ad552
image: dstacktee/dstack-ingress:2.1
ports:
- "443:443"
environment:
Expand All @@ -24,5 +24,5 @@
restart: unless-stopped

volumes:
cert-data:

Check failure on line 27 in custom-domain/dstack-ingress/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Basic Checks (dev.sh)

27:13 [empty-values] empty value in block mapping

Check failure on line 27 in custom-domain/dstack-ingress/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / check-all

27:13 [empty-values] empty value in block mapping
evidences:

Check failure on line 28 in custom-domain/dstack-ingress/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Basic Checks (dev.sh)

28:13 [empty-values] empty value in block mapping

Check failure on line 28 in custom-domain/dstack-ingress/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / check-all

28:13 [empty-values] empty value in block mapping
4 changes: 3 additions & 1 deletion custom-domain/dstack-ingress/scripts/build-combined-pems.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@

set -e

source /scripts/functions.sh

CERT_DIR="/etc/haproxy/certs"
mkdir -p "$CERT_DIR"

all_domains=$(get-all-domains.sh)

while IFS= read -r domain; do
[[ -n "$domain" ]] || continue
le_dir="/etc/letsencrypt/live/${domain}"
le_dir="/etc/letsencrypt/live/$(cert_dir_name "$domain")"
combined="${CERT_DIR}/${domain}.pem"
if [ -f "${le_dir}/fullchain.pem" ] && [ -f "${le_dir}/privkey.pem" ]; then
cat "${le_dir}/fullchain.pem" "${le_dir}/privkey.pem" > "$combined"
Expand Down
8 changes: 6 additions & 2 deletions custom-domain/dstack-ingress/scripts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,13 @@ EOF
if [ "$EVIDENCE_SERVER" = "true" ]; then
cat <<'EVIDENCE_BLOCK' >>/etc/haproxy/haproxy.cfg

# Route /evidences requests to local evidence HTTP server
# Route /evidences requests to the local evidence HTTP server.
# inspect-delay sets the upper bound for buffering; the accept rule
# fires as soon as any application data is present in the buffer
# (after SSL termination a full TLS record is decrypted atomically,
# so the complete HTTP request is available on first evaluation).
tcp-request inspect-delay 5s
tcp-request content accept if WAIT_END
tcp-request content accept if { req.len gt 0 }
acl is_evidence payload(0,0) -m beg "GET /evidences"
acl is_evidence payload(0,0) -m beg "HEAD /evidences"
use_backend be_evidence if is_evidence
Expand Down
Loading