Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/sandbox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,12 @@ FROM golang:1.25-bookworm AS go-builder

RUN mkdir -p /usr/local/share/ca-certificates
RUN --mount=type=secret,id=wrangler_ca \
apt-get update && apt-get install -y --no-install-recommends ca-certificates && \
if [ -f /run/secrets/wrangler_ca ] && [ -s /run/secrets/wrangler_ca ]; then \
cp /run/secrets/wrangler_ca /usr/local/share/ca-certificates/wrangler-dev-ca.crt && \
apt-get update && apt-get install -y --no-install-recommends ca-certificates && \
update-ca-certificates; \
fi
cp /run/secrets/wrangler_ca /usr/local/share/ca-certificates/wrangler-dev-ca.crt; \
fi && \
update-ca-certificates && \
rm -rf /var/lib/apt/lists/*

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libx11-dev libxtst-dev libxinerama-dev libpng-dev \
Expand Down
7 changes: 4 additions & 3 deletions packages/sandbox/scripts/docker-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ cd "$(dirname "$0")/../../.."

VERSION="$npm_package_version"
IMAGE="cloudflare/sandbox-test"
WRANGLER_CA_CERT="${NODE_EXTRA_CA_CERTS:-${SSL_CERT_FILE:-/dev/null}}"

docker build \
-f packages/sandbox/Dockerfile \
Expand All @@ -29,7 +30,7 @@ docker build \
--platform linux/amd64 \
--build-arg SANDBOX_VERSION="$VERSION" \
-t "$IMAGE:$VERSION-opencode" \
--secret id=wrangler_ca,src="${NODE_EXTRA_CA_CERTS:-/dev/null}" \
--secret id=wrangler_ca,src="$WRANGLER_CA_CERT" \
.

docker build \
Expand All @@ -38,7 +39,7 @@ docker build \
--platform linux/amd64 \
--build-arg SANDBOX_VERSION="$VERSION" \
-t "$IMAGE:$VERSION-desktop" \
--secret id=wrangler_ca,src="${NODE_EXTRA_CA_CERTS:-/dev/null}" \
--secret id=wrangler_ca,src="$WRANGLER_CA_CERT" \
.

STANDALONE_DIR="tests/e2e/test-worker"
Expand All @@ -57,5 +58,5 @@ docker build \
--platform linux/amd64 \
--build-arg SANDBOX_VERSION="$VERSION" \
-t "$IMAGE:$VERSION-musl" \
--secret id=wrangler_ca,src="${NODE_EXTRA_CA_CERTS:-/dev/null}" \
--secret id=wrangler_ca,src="$WRANGLER_CA_CERT" \
.
Loading