diff --git a/custom-domain/dstack-ingress/README.md b/custom-domain/dstack-ingress/README.md index c878b24..c767569 100644 --- a/custom-domain/dstack-ingress/README.md +++ b/custom-domain/dstack-ingress/README.md @@ -71,7 +71,7 @@ The fastest way to get started is to use our pre-built image. Simply use the fol ```yaml services: dstack-ingress: - image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32 + image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458 ports: - "443:443" environment: @@ -104,7 +104,7 @@ volumes: ```yaml services: ingress: - image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32 + image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458 ports: - "443:443" environment: @@ -222,7 +222,7 @@ example: ```yaml services: dstack-ingress: - image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32 + image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458 ports: - "443:443" environment: diff --git a/custom-domain/dstack-ingress/build-image.sh b/custom-domain/dstack-ingress/build-image.sh index 4df4d11..36bcd0f 100755 --- a/custom-domain/dstack-ingress/build-image.sh +++ b/custom-domain/dstack-ingress/build-image.sh @@ -56,6 +56,9 @@ else echo "Or use skopeo directly:" echo "" echo " skopeo copy --insecure-policy oci-archive:./oci.tar docker://[:]" + echo "" + echo " Pushing image to dstacktee org:" + echo " skopeo copy --insecure-policy oci-archive:./oci.tar docker://dstacktee/dstack-ingress:$(date +%Y%m%d) --authfile ~/.docker/config.json" fi echo "" diff --git a/custom-domain/dstack-ingress/docker-compose.multi.yaml b/custom-domain/dstack-ingress/docker-compose.multi.yaml index 5d105bf..3af19e4 100644 --- a/custom-domain/dstack-ingress/docker-compose.multi.yaml +++ b/custom-domain/dstack-ingress/docker-compose.multi.yaml @@ -1,6 +1,6 @@ services: ingress: - image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32 + image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458 ports: - "443:443" environment: diff --git a/custom-domain/dstack-ingress/docker-compose.yaml b/custom-domain/dstack-ingress/docker-compose.yaml index c830374..89c936c 100644 --- a/custom-domain/dstack-ingress/docker-compose.yaml +++ b/custom-domain/dstack-ingress/docker-compose.yaml @@ -1,6 +1,6 @@ services: dstack-ingress: - image: dstacktee/dstack-ingress:20250924@sha256:40429d78060ef3066b5f93676bf3ba7c2e9ac47d4648440febfdda558aed4b32 + image: dstacktee/dstack-ingress:20250929@sha256:2b47b3e538df0b3e7724255b89369194c8c83a7cfba64d2faf0115ad0a586458 ports: - "443:443" environment: diff --git a/custom-domain/dstack-ingress/scripts/entrypoint.sh b/custom-domain/dstack-ingress/scripts/entrypoint.sh index 6b26869..e394d80 100644 --- a/custom-domain/dstack-ingress/scripts/entrypoint.sh +++ b/custom-domain/dstack-ingress/scripts/entrypoint.sh @@ -3,11 +3,7 @@ set -e PORT=${PORT:-443} -if [[ -e /var/run/dstack.sock ]]; then - TXT_PREFIX=${TXT_PREFIX:-"_dstack-app-address"} -else - TXT_PREFIX=${TXT_PREFIX:-"_tapp-address"} -fi +TXT_PREFIX=${TXT_PREFIX:-"_dstack-app-address"} PROXY_CMD="proxy" if [[ "${TARGET_ENDPOINT}" == grpc://* ]]; then PROXY_CMD="grpc" @@ -127,7 +123,7 @@ set_txt_record() { local domain="$1" local APP_ID - if [[ -e /var/run/dstack.sock ]]; then + if [[ -S /var/run/dstack.sock ]]; then DSTACK_APP_ID=$(curl -s --unix-socket /var/run/dstack.sock http://localhost/Info | jq -j .app_id) export DSTACK_APP_ID else diff --git a/custom-domain/dstack-ingress/scripts/generate-evidences.sh b/custom-domain/dstack-ingress/scripts/generate-evidences.sh index e253032..59ce10b 100644 --- a/custom-domain/dstack-ingress/scripts/generate-evidences.sh +++ b/custom-domain/dstack-ingress/scripts/generate-evidences.sh @@ -40,7 +40,7 @@ while [ ${#PADDED_HASH} -lt 128 ]; do done QUOTED_HASH="${PADDED_HASH}" -if [[ -e /var/run/dstack.sock ]]; then +if [[ -S /var/run/dstack.sock ]]; then curl -s --unix-socket /var/run/dstack.sock "http://localhost/GetQuote?report_data=${QUOTED_HASH}" > quote.json else curl -s --unix-socket /var/run/tappd.sock "http://localhost/prpc/Tappd.RawQuote?report_data=${QUOTED_HASH}" > quote.json