Fix Bug for Cloning Repository (#142)

* change config

* add echo statements for debugging

* fix bug

* remove repo check

* change config

* remove client.software

Author: 7174Andy

lablink-allocator/lablink-allocator-service/conf/config.yaml

@@ -9,10 +9,10 @@ db:
 
 machine:
   machine_type: "g4dn.xlarge"
-  image: "ghcr.io/talmolab/lablink-client-base-image:linux-amd64-test"
+  image: "ghcr.io/talmolab/lablink-sleap-client-image:linux-amd64-test"
   ami_id: "ami-067cc81f948e50e06"
   repository: "https://github.com/talmolab/sleap-tutorial-data.git"
-  software: "mousepad"
+  software: "sleap"
 
 app:
   admin_user: "admin"

lablink-allocator/lablink-allocator-service/terraform/user_data.sh

@@ -1,6 +1,15 @@
 #!/bin/bash
 set -euo pipefail
 
+echo ">> Configuration:"
+echo "  - Allocator IP: ${allocator_ip}"
+echo "  - Resource Suffix: ${resource_suffix}"
+echo "  - Count Index: ${count_index}"
+echo "  - Subject Software: ${subject_software}"
+echo "  - Image Name: ${image_name}"
+echo "  - Machine Type GPU Support: ${gpu_support}"
+echo "  - GitHub Repository: ${repository}"
+
 echo ">> Checking GPU Support…"
 
 
@@ -61,21 +70,11 @@ if [ "$HAS_GPU" = true ]; then
 fi
 
 echo ">> Starting container..."
-if [ -z "$${repository:-}" ]; then
-    echo ">> No repo specified; starting container without cloning."
-    docker run -dit $DOCKER_GPU_ARGS \
-        -e ALLOCATOR_HOST="${allocator_ip}" \
-        -e VM_NAME="lablink-vm-${resource_suffix}-${count_index}" \
-        -e SUBJECT_SOFTWARE="${subject_software}" \
-        "${image_name}"
-else
-    echo ">> Cloning repo and starting container."
-    docker run -dit $DOCKER_GPU_ARGS \
-        -e ALLOCATOR_HOST="${allocator_ip}" \
-        -e TUTORIAL_REPO_TO_CLONE="${repository}" \
-        -e VM_NAME="lablink-vm-${resource_suffix}-${count_index}" \
-        -e SUBJECT_SOFTWARE="${subject_software}" \
-        "${image_name}"
-fi
+docker run -dit $DOCKER_GPU_ARGS \
+    -e ALLOCATOR_HOST="${allocator_ip}" \
+    -e TUTORIAL_REPO_TO_CLONE="${repository}" \
+    -e VM_NAME="lablink-vm-${resource_suffix}-${count_index}" \
+    -e SUBJECT_SOFTWARE="${subject_software}" \
+    "${image_name}"
 
 echo ">> Container launched."

lablink-client-base/lablink-client-base-image/start.sh

@@ -23,7 +23,7 @@ else
 fi
 
 # Activate the conda environment and run the subscribe script
-/home/client/miniforge3/bin/conda run -n base subscribe allocator.host=$ALLOCATOR_HOST allocator.port=80 client.software=$SUBJECT_SOFTWARE &
+/home/client/miniforge3/bin/conda run -n base subscribe allocator.host=$ALLOCATOR_HOST allocator.port=80 &
 
 # Wait for the subscribe script to start
 sleep 5