fix: abort if download of THOR binaries failed

Author: Marius Benthin

docker-compose.yml

@@ -47,7 +47,7 @@ services:
       # Optional: mount TLS certificate and private key (uncomment TLS_CERT/TLS_KEY above as well)
       # - ./tls_cert:/run/secrets/tls_cert:ro
       # - ./tls_key:/run/secrets/tls_key:ro
-    restart: unless-stopped
+    restart: on-failure
     # THOR 10: periodically restart the container by signaling PID 1 once uptime exceeds
     # SIGNATURE_UPDATE_INTERVAL hours; restart policy brings it back up. Skipped when
     # SIGNATURE_UPDATE_INTERVAL is 0 (disabled, default) or TECHPREVIEW is set (THOR 11

entrypoint.sh

@@ -4,14 +4,21 @@
 if [ ! -f "$TARGET_DIR/thor-util" ]; then
     if [ -z "$CONTRACT_TOKEN" ]; then
         echo "CONTRACT_TOKEN is required to download THOR!" >&2
-        exit 1
+        exit 0
     fi
     echo "Downloading THOR..." && \
-    wget -q -O "$TEMP_DIR/thor.zip" "https://portal.nextron-systems.com/api/voucher/download/$CONTRACT_TOKEN/thor/linux" && \
+    wget -O "$TEMP_DIR/thor.zip" "https://portal.nextron-systems.com/api/voucher/download/$CONTRACT_TOKEN/thor/linux" && \
         unzip -o -q "$TEMP_DIR/thor.zip" -d "$TARGET_DIR" && \
         rm "$TEMP_DIR/thor.zip"
 fi
 
+# abort if THOR binary is not available
+if [ ! -f "$TARGET_DIR/thor-linux-64" ]; then
+    echo "THOR binary not found at $TARGET_DIR/thor-linux-64. Abort!"
+    echo "Please verify that your CONTRACT_TOKEN is set and valid."
+    exit 0
+fi
+
 # detect THOR channel using the "-dev" pre-release suffix in the manifest
 # TODO: has to be adjusted once THOR 11 is in techpreview but does not carry the -dev suffix anymore
 THOR_CHANNEL=stable
@@ -30,7 +37,7 @@ fi
 THOR_VERSION=$("$TARGET_DIR/thor-linux-64" --version 2>&1 | awk '/^THOR / { split($2, v, "."); print v[1]; exit }')
 if [ -z "$THOR_VERSION" ]; then
     echo "Failed to detect THOR major version from $TARGET_DIR/thor-linux-64 --version" >&2
-    exit 1
+    exit 0
 fi
 echo "Detected THOR major version: $THOR_VERSION"