ci: fix installer smoke

Author: steipete

.github/workflows/deploy.yml

@@ -1,8 +1,6 @@
 name: Deploy to GitHub Pages
 
 on:
-  push:
-    branches: [main]
   workflow_dispatch:
 
 permissions:

.github/workflows/install-smoke.yml

@@ -14,25 +14,20 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build smoke image (root)
-        run: docker build -t clawdbot-install-smoke:ci -f scripts/docker/install-sh-smoke/Dockerfile scripts/docker/install-sh-smoke
+        run: docker build -t clawdbot-install-smoke:ci -f scripts/docker/install-sh-smoke/Dockerfile .
 
       - name: Run install smoke (root)
         env:
-          CLAWDBOT_INSTALL_URL: file://$GITHUB_WORKSPACE/public/install.sh
           CLAWDBOT_NO_ONBOARD: "1"
-        run: docker run --rm -t -e CLAWDBOT_INSTALL_URL -e CLAWDBOT_NO_ONBOARD clawdbot-install-smoke:ci
+        run: docker run --rm -t -e CLAWDBOT_NO_ONBOARD clawdbot-install-smoke:ci
 
       - name: Build non-root image
-        run: docker build -t clawdbot-install-nonroot:ci -f scripts/docker/install-sh-nonroot/Dockerfile scripts/docker/install-sh-nonroot
+        run: docker build -t clawdbot-install-nonroot:ci -f scripts/docker/install-sh-nonroot/Dockerfile .
 
       - name: Run install smoke (non-root + CLI)
         env:
-          CLAWDBOT_INSTALL_URL: file://$GITHUB_WORKSPACE/public/install.sh
-          CLAWDBOT_INSTALL_CLI_URL: file://$GITHUB_WORKSPACE/public/install-cli.sh
           CLAWDBOT_NO_ONBOARD: "1"
         run: |
           docker run --rm -t \
-            -e CLAWDBOT_INSTALL_URL \
-            -e CLAWDBOT_INSTALL_CLI_URL \
             -e CLAWDBOT_NO_ONBOARD \
             clawdbot-install-nonroot:ci

scripts/docker/install-sh-nonroot/Dockerfile

@@ -1,11 +1,12 @@
 FROM ubuntu:24.04
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     bash \
     ca-certificates \
     curl \
     sudo \
+    tzdata \
   && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m -s /bin/bash app \
@@ -17,7 +18,10 @@ WORKDIR /home/app
 ENV NPM_CONFIG_FUND=false
 ENV NPM_CONFIG_AUDIT=false
 
-COPY run.sh /usr/local/bin/clawdbot-install-nonroot
-RUN sudo chmod +x /usr/local/bin/clawdbot-install-nonroot
+COPY scripts/docker/install-sh-nonroot/run.sh /usr/local/bin/clawdbot-install-nonroot
+COPY public/install.sh /opt/clawdbot-install.sh
+COPY public/install-cli.sh /opt/clawdbot-install-cli.sh
+RUN sudo chmod +x /usr/local/bin/clawdbot-install-nonroot \
+  && sudo chmod a+r /opt/clawdbot-install.sh /opt/clawdbot-install-cli.sh
 
 ENTRYPOINT ["/usr/local/bin/clawdbot-install-nonroot"]

scripts/docker/install-sh-nonroot/run.sh

@@ -1,8 +1,23 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-INSTALL_URL="${CLAWDBOT_INSTALL_URL:-https://clawd.bot/install.sh}"
-CLI_INSTALL_URL="${CLAWDBOT_INSTALL_CLI_URL:-https://clawd.bot/install-cli.sh}"
+LOCAL_INSTALL_PATH="/opt/clawdbot-install.sh"
+LOCAL_CLI_INSTALL_PATH="/opt/clawdbot-install-cli.sh"
+if [[ -n "${CLAWDBOT_INSTALL_URL:-}" ]]; then
+  INSTALL_URL="$CLAWDBOT_INSTALL_URL"
+elif [[ -f "$LOCAL_INSTALL_PATH" ]]; then
+  INSTALL_URL="file://${LOCAL_INSTALL_PATH}"
+else
+  INSTALL_URL="https://clawd.bot/install.sh"
+fi
+
+if [[ -n "${CLAWDBOT_INSTALL_CLI_URL:-}" ]]; then
+  CLI_INSTALL_URL="$CLAWDBOT_INSTALL_CLI_URL"
+elif [[ -f "$LOCAL_CLI_INSTALL_PATH" ]]; then
+  CLI_INSTALL_URL="file://${LOCAL_CLI_INSTALL_PATH}"
+else
+  CLI_INSTALL_URL="https://clawd.bot/install-cli.sh"
+fi
 
 echo "==> Pre-flight: ensure git absent"
 if command -v git >/dev/null; then
@@ -11,7 +26,7 @@ if command -v git >/dev/null; then
 fi
 
 echo "==> Run installer (non-root user)"
-curl -fsSL "$INSTALL_URL" | bash --no-onboard
+curl -fsSL "$INSTALL_URL" | bash -s -- --no-onboard
 
 # Ensure PATH picks up user npm prefix
 export PATH="$HOME/.npm-global/bin:$PATH"

scripts/docker/install-sh-smoke/Dockerfile

@@ -9,7 +9,9 @@ RUN apt-get update \
     sudo \
   && rm -rf /var/lib/apt/lists/*
 
-COPY run.sh /usr/local/bin/clawdbot-install-smoke
-RUN chmod +x /usr/local/bin/clawdbot-install-smoke
+COPY scripts/docker/install-sh-smoke/run.sh /usr/local/bin/clawdbot-install-smoke
+COPY public/install.sh /opt/clawdbot-install.sh
+RUN chmod +x /usr/local/bin/clawdbot-install-smoke \
+  && chmod a+r /opt/clawdbot-install.sh
 
 ENTRYPOINT ["/usr/local/bin/clawdbot-install-smoke"]

scripts/docker/install-sh-smoke/run.sh

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-INSTALL_URL="${CLAWDBOT_INSTALL_URL:-https://clawd.bot/install.sh}"
+LOCAL_INSTALL_PATH="/opt/clawdbot-install.sh"
+if [[ -n "${CLAWDBOT_INSTALL_URL:-}" ]]; then
+  INSTALL_URL="$CLAWDBOT_INSTALL_URL"
+elif [[ -f "$LOCAL_INSTALL_PATH" ]]; then
+  INSTALL_URL="file://${LOCAL_INSTALL_PATH}"
+else
+  INSTALL_URL="https://clawd.bot/install.sh"
+fi
 
 echo "==> Resolve npm versions"
 LATEST_VERSION="$(npm view clawdbot version)"
@@ -23,7 +30,7 @@ echo "==> Preinstall previous (forces installer upgrade path)"
 npm install -g "clawdbot@${PREVIOUS_VERSION}"
 
 echo "==> Run official installer one-liner"
-curl -fsSL "$INSTALL_URL" | bash --no-onboard
+curl -fsSL "$INSTALL_URL" | bash -s -- --no-onboard
 
 echo "==> Verify installed version"
 INSTALLED_VERSION="$(clawdbot --version 2>/dev/null | head -n 1 | tr -d '\r')"