imp: try dstack.sock first and failback to tappd.sock

Author: Leechael

custom-domain/dstack-ingress/README.md

@@ -76,6 +76,7 @@ services:
       - SET_CAA=true
       - TARGET_ENDPOINT=http://app:80
     volumes:
+      - /var/run/dstack.sock:/var/run/dstack.sock
       - /var/run/tappd.sock:/var/run/tappd.sock
       - cert-data:/etc/letsencrypt
     restart: unless-stopped
@@ -146,6 +147,7 @@ services:
       - SET_CAA=true
       - TARGET_ENDPOINT=grpc://app:50051
     volumes:
+      - /var/run/dstack.sock:/var/run/dstack.sock
       - /var/run/tappd.sock:/var/run/tappd.sock
       - cert-data:/etc/letsencrypt
     restart: unless-stopped

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

@@ -11,6 +11,7 @@ services:
       - SET_CAA=true
       - TARGET_ENDPOINT=http://app:80
     volumes:
+      - /var/run/dstack.sock:/var/run/dstack.sock
       - /var/run/tappd.sock:/var/run/tappd.sock
       - cert-data:/etc/letsencrypt
     restart: unless-stopped

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

@@ -107,7 +107,14 @@ set_txt_record() {
     local APP_ID
 
     # Generate a unique app ID if not provided
-    APP_ID=${APP_ID:-$(curl -s --unix-socket /var/run/tappd.sock http://localhost/prpc/Tappd.Info | jq -j '.app_id')}
+    if [[ -e /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
+        DSTACK_APP_ID=$(curl -s --unix-socket /var/run/tappd.sock http://localhost/prpc/Tappd.Info | jq -j .app_id)
+        export DSTACK_APP_ID
+    fi
+    APP_ID=${APP_ID:-"$DSTACK_APP_ID"}
 
     # Use the unified DNS manager to set the TXT record
     source /opt/app-venv/bin/activate

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

@@ -19,7 +19,11 @@ while [ ${#PADDED_HASH} -lt 128 ]; do
 done
 QUOTED_HASH="${PADDED_HASH}"
 
-curl -s --unix-socket /var/run/tappd.sock "http://localhost/prpc/Tappd.RawQuote?report_data=${QUOTED_HASH}" > quote.json
+if [[ -e /var/run/dstack.sock ]]; then
+    curl -s --unix-socket /var/run/dstack.sock "http://localhost/prpc/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
+fi
 if [ $? -ne 0 ]; then
     echo "Error: Failed to generate evidences"
     exit 1