Skip to content

Commit 68511eb

Browse files
authored
Merge pull request #55 from Dstack-TEE/chk-uds
ingress: ensure dstack.sock is a UDS before using it
2 parents 1a43a9c + 6ea4ac5 commit 68511eb

6 files changed

Lines changed: 11 additions & 12 deletions

File tree

custom-domain/dstack-ingress/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The fastest way to get started is to use our pre-built image. Simply use the fol
7171
```yaml
7272
services:
7373
dstack-ingress:
74-
image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32
74+
image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458
7575
ports:
7676
- "443:443"
7777
environment:
@@ -104,7 +104,7 @@ volumes:
104104
```yaml
105105
services:
106106
ingress:
107-
image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32
107+
image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458
108108
ports:
109109
- "443:443"
110110
environment:
@@ -222,7 +222,7 @@ example:
222222
```yaml
223223
services:
224224
dstack-ingress:
225-
image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32
225+
image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458
226226
ports:
227227
- "443:443"
228228
environment:

custom-domain/dstack-ingress/build-image.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ else
5656
echo "Or use skopeo directly:"
5757
echo ""
5858
echo " skopeo copy --insecure-policy oci-archive:./oci.tar docker://<repo>[:<tag>]"
59+
echo ""
60+
echo " Pushing image to dstacktee org:"
61+
echo " skopeo copy --insecure-policy oci-archive:./oci.tar docker://dstacktee/dstack-ingress:$(date +%Y%m%d) --authfile ~/.docker/config.json"
5962
fi
6063
echo ""
6164

custom-domain/dstack-ingress/docker-compose.multi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
ingress:
3-
image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32
3+
image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458
44
ports:
55
- "443:443"
66
environment:

custom-domain/dstack-ingress/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
dstack-ingress:
3-
image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32
3+
image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458
44
ports:
55
- "443:443"
66
environment:

custom-domain/dstack-ingress/scripts/entrypoint.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
set -e
44

55
PORT=${PORT:-443}
6-
if [[ -e /var/run/dstack.sock ]]; then
7-
TXT_PREFIX=${TXT_PREFIX:-"_dstack-app-address"}
8-
else
9-
TXT_PREFIX=${TXT_PREFIX:-"_tapp-address"}
10-
fi
6+
TXT_PREFIX=${TXT_PREFIX:-"_dstack-app-address"}
117
PROXY_CMD="proxy"
128
if [[ "${TARGET_ENDPOINT}" == grpc://* ]]; then
139
PROXY_CMD="grpc"
@@ -127,7 +123,7 @@ set_txt_record() {
127123
local domain="$1"
128124
local APP_ID
129125

130-
if [[ -e /var/run/dstack.sock ]]; then
126+
if [[ -S /var/run/dstack.sock ]]; then
131127
DSTACK_APP_ID=$(curl -s --unix-socket /var/run/dstack.sock http://localhost/Info | jq -j .app_id)
132128
export DSTACK_APP_ID
133129
else

custom-domain/dstack-ingress/scripts/generate-evidences.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ while [ ${#PADDED_HASH} -lt 128 ]; do
4040
done
4141
QUOTED_HASH="${PADDED_HASH}"
4242

43-
if [[ -e /var/run/dstack.sock ]]; then
43+
if [[ -S /var/run/dstack.sock ]]; then
4444
curl -s --unix-socket /var/run/dstack.sock "http://localhost/GetQuote?report_data=${QUOTED_HASH}" > quote.json
4545
else
4646
curl -s --unix-socket /var/run/tappd.sock "http://localhost/prpc/Tappd.RawQuote?report_data=${QUOTED_HASH}" > quote.json

0 commit comments

Comments
 (0)