wip

Author: leseb

.github/workflows/providers-build.yml

@@ -231,19 +231,14 @@ jobs:
 
       - name: Test the export
         run: |
-          USE_COPY_NOT_MOUNT=true LLAMA_STACK_DIR=. uv run llama stack build --config llama_stack/templates/starter/build.yaml --export-dir export
+          # Support for USE_COPY_NOT_MOUNT=true LLAMA_STACK_DIR=. will be added in the future
+          uv run llama stack build --config llama_stack/templates/starter/build.yaml --export-dir export
           for file in export/*; do
             echo "File: $file"
             if [[ "$file" == *.tar.gz ]]; then
               echo "Tarball found"
               tarball_found=1
-              tar -xzvf "$file"
-              if [ -f "Containerfile" ]; then
-                echo "Containerfile found"
-              else
-                echo "Containerfile not found"
-                exit 1
-              fi
+              tar -xzvf "$file" -C export
             else
               continue
             fi
@@ -254,4 +249,8 @@ jobs:
             exit 1
           fi
           cd export
-          docker build -t test .
+          docker build -t export-test -f ./Containerfile .
+
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3

llama_stack/distribution/build_container.sh

@@ -289,13 +289,20 @@ if [ -n "$export_dir" ]; then
   echo "Creating tarball with the following files:"
   echo "- Containerfile"
   [ -n "$run_config" ] && echo "- run.yaml"
-  [ -n "$external_providers_dir" ] && echo "- providers.d directory"
+  [ -n "$external_providers_dir" ] && [ -d "$external_providers_dir" ] && echo "- providers.d directory"
 
   # Capture both stdout and stderr from tar command
-  tar_output=$(tar -czf "$export_dir/$tar_name" \
-    -C "$TEMP_DIR" Containerfile \
-    ${run_config:+-C "$BUILD_CONTEXT_DIR" "$(basename run.yaml)"} \
-    ${external_providers_dir:+-C "$BUILD_CONTEXT_DIR" providers.d} 2>&1)
+  tar_cmd="tar -czf \"$export_dir/$tar_name\" -C \"$TEMP_DIR\" Containerfile"
+
+  if [ -n "$run_config" ]; then
+    tar_cmd="$tar_cmd -C \"$BUILD_CONTEXT_DIR\" \"$(basename run.yaml)\""
+  fi
+
+  if [ -n "$external_providers_dir" ] && [ -d "$external_providers_dir" ]; then
+    tar_cmd="$tar_cmd -C \"$BUILD_CONTEXT_DIR\" providers.d"
+  fi
+
+  tar_output=$(eval "$tar_cmd" 2>&1)
   tar_status=$?
 
   if [ $tar_status -ne 0 ]; then