config: Update 2 files

.gitea/workflows/BuildTestPublish.yaml

@@ -15,7 +15,8 @@ jobs:
           - linux/amd64
           - linux/arm64
     runs-on: ${{ matrix.platform }}
-    image: gitea.jde.nz/public/dropshell-build-base:latest
+    container:
+      image: gitea.jde.nz/public/dropshell-build-base:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

getpkg/build.sh

@@ -27,31 +27,20 @@ if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
   echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
   echo "=== ENVIRONMENT DEBUG ==="
   echo "Image info:"
-  cat /etc/os-release 2>/dev/null || echo "No /etc/os-release"
+  cat /etc/os-release 2>/dev/null || cat /etc/alpine-release 2>/dev/null || echo "Unknown OS"
-  echo "Available in /usr/local/bin:"
-  ls -la /usr/local/bin/ 2>/dev/null || echo "No /usr/local/bin"
-  echo "Available in /usr/bin (cmake related):"
-  ls -la /usr/bin/ | grep cmake || echo "No cmake in /usr/bin"
   echo "Current PATH: $PATH"
-  echo "Checking for cmake..."
+  echo "cmake location: $(which cmake 2>/dev/null || echo 'not found')"
-  find /usr -name "cmake" 2>/dev/null || echo "cmake not found anywhere in /usr"
   echo "========================="
   
-  # Try to use cmake directly since we should be in the build image
+  # Should now be running in Alpine build-base image with cmake available
-  export PATH="/usr/local/bin:/usr/bin:$PATH"
   if which cmake >/dev/null 2>&1; then
-    echo "cmake found, building directly"
+    echo "cmake found at: $(which cmake)"
+    echo "Building directly in Alpine CI environment"
     cd "${SCRIPT_DIR}" && ${COMMAND_TO_RUN}
   else
-    echo "ERROR: cmake not available in build image - this shouldn't happen!"
+    echo "ERROR: cmake not found in build-base image!"
-    echo "Falling back to nested docker (not ideal)"
+    echo "This indicates the container directive isn't working"
-    docker run --rm \
+    exit 1
-      -v "${SCRIPT_DIR}:/app:ro" \
-      -v "${SCRIPT_DIR}/build:/app/build" \
-      -v "${SCRIPT_DIR}/output:/app/output" \
-      -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-      gitea.jde.nz/public/dropshell-build-base:latest \
-      bash -c "cd /app && ${COMMAND_TO_RUN}"
   fi
 else
   echo "Building in new docker container"