Merge dev to main: Security improvements and comprehensive test infrastructure #39
@@ -47,6 +47,18 @@ jobs:
|
||||
if: env.ROLLBACK_ONLY == '0'
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# Check if base image exists, build if missing
|
||||
if ! docker image inspect claude-dev-base:latest >/dev/null 2>&1; then
|
||||
echo "Base image not found, building claude-dev-base:latest..."
|
||||
DOCKER_BUILDKIT=0 docker build \
|
||||
-f claude-dev/Dockerfile.base \
|
||||
-t claude-dev-base:latest \
|
||||
claude-dev/
|
||||
else
|
||||
echo "Using existing claude-dev-base:latest"
|
||||
fi
|
||||
|
||||
# Build runtime image (fast, just copies scripts)
|
||||
DOCKER_BUILDKIT=0 docker build \
|
||||
--cache-from claude-dev:latest \
|
||||
-t "$CLAUDE_DEV_IMAGE" \
|
||||
|
||||
+1
-58
@@ -1,61 +1,4 @@
|
||||
FROM node:20-bookworm-slim
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
bash \
|
||||
ca-certificates \
|
||||
curl \
|
||||
fd-find \
|
||||
gh \
|
||||
git \
|
||||
jq \
|
||||
make \
|
||||
openssh-client \
|
||||
python3 \
|
||||
ripgrep \
|
||||
rsync \
|
||||
tmux \
|
||||
unzip \
|
||||
wget \
|
||||
zip \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN ln -sf /usr/bin/fdfind /usr/local/bin/fd
|
||||
|
||||
ARG YQ_VERSION=v4.44.6
|
||||
RUN wget -q -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" \
|
||||
&& chmod +x /usr/local/bin/yq
|
||||
|
||||
ARG TEA_VERSION=0.12.0
|
||||
RUN wget -q -O /usr/local/bin/tea "https://gitea.com/gitea/tea/releases/download/v${TEA_VERSION}/tea-${TEA_VERSION}-linux-amd64" \
|
||||
&& chmod +x /usr/local/bin/tea
|
||||
|
||||
RUN npm install -g @anthropic-ai/claude-code
|
||||
|
||||
RUN python3 - <<'PY'
|
||||
from pathlib import Path
|
||||
import re
|
||||
|
||||
path = Path("/usr/local/lib/node_modules/@anthropic-ai/claude-code/cli.js")
|
||||
if not path.exists():
|
||||
raise SystemExit(f"claude cli not found: {path}")
|
||||
|
||||
content = path.read_text()
|
||||
pattern = r'let A=U7\(\),q=new URL\(A\.TOKEN_URL\),K=\[`\$\{A\.BASE_API_URL\}/api/hello`,`\$\{q\.origin\}/v1/oauth/hello`\],Y=async\(_\)=>\{try\{let \$=await I8\.get\(_,\{headers:\{"User-Agent":ey\(\)\}\}\);if\(\$\.status!==200\)return\{success:!1,error:`Failed to connect to \$\{new URL\(_\)\.hostname\}: Status \$\{\$\.status\}`\};return\{success:!0\}\}catch\(\$\)\{'
|
||||
replacement = 'return'
|
||||
patched, count = re.subn(pattern, replacement, content, count=1)
|
||||
if count != 1:
|
||||
raise SystemExit("preflight patch target not found in claude cli; refusing to build")
|
||||
|
||||
path.write_text(patched)
|
||||
|
||||
if re.search(pattern, path.read_text()):
|
||||
raise SystemExit("preflight patch did not apply cleanly")
|
||||
|
||||
print("Applied Claude preflight bypass patch")
|
||||
PY
|
||||
FROM claude-dev-base:latest
|
||||
|
||||
WORKDIR /repos/nas-tools
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
FROM node:20-bookworm-slim
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
bash \
|
||||
ca-certificates \
|
||||
curl \
|
||||
fd-find \
|
||||
gh \
|
||||
git \
|
||||
jq \
|
||||
make \
|
||||
openssh-client \
|
||||
python3 \
|
||||
ripgrep \
|
||||
rsync \
|
||||
tmux \
|
||||
unzip \
|
||||
wget \
|
||||
zip \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN ln -sf /usr/bin/fdfind /usr/local/bin/fd
|
||||
|
||||
ARG YQ_VERSION=v4.44.6
|
||||
RUN wget -q -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" \
|
||||
&& chmod +x /usr/local/bin/yq
|
||||
|
||||
ARG TEA_VERSION=0.12.0
|
||||
RUN wget -q -O /usr/local/bin/tea "https://gitea.com/gitea/tea/releases/download/v${TEA_VERSION}/tea-${TEA_VERSION}-linux-amd64" \
|
||||
&& chmod +x /usr/local/bin/tea
|
||||
|
||||
RUN npm install -g @anthropic-ai/claude-code
|
||||
|
||||
RUN python3 - <<'PY'
|
||||
from pathlib import Path
|
||||
import re
|
||||
|
||||
path = Path("/usr/local/lib/node_modules/@anthropic-ai/claude-code/cli.js")
|
||||
if not path.exists():
|
||||
raise SystemExit(f"claude cli not found: {path}")
|
||||
|
||||
content = path.read_text()
|
||||
pattern = r'let A=U7\(\),q=new URL\(A\.TOKEN_URL\),K=\[`\$\{A\.BASE_API_URL\}/api/hello`,`\$\{q\.origin\}/v1/oauth/hello`\],Y=async\(_\)=>\{try\{let \$=await I8\.get\(_,\{headers:\{"User-Agent":ey\(\)\}\}\);if\(\$\.status!==200\)return\{success:!1,error:`Failed to connect to \$\{new URL\(_\)\.hostname\}: Status \$\{\$\.status\}`\};return\{success:!0\}\}catch\(\$\)\{'
|
||||
replacement = 'return'
|
||||
patched, count = re.subn(pattern, replacement, content, count=1)
|
||||
if count != 1:
|
||||
raise SystemExit("preflight patch target not found in claude cli; refusing to build")
|
||||
|
||||
path.write_text(patched)
|
||||
|
||||
if re.search(pattern, path.read_text()):
|
||||
raise SystemExit("preflight patch did not apply cleanly")
|
||||
|
||||
print("Applied Claude preflight bypass patch")
|
||||
PY
|
||||
|
||||
CMD ["bash"]
|
||||
Reference in New Issue
Block a user