create-windy 0.6.2 → 0.6.3

package/dist/cli.js

@@ -2832,6 +2832,14 @@ var openSearchComposeService = `  opensearch:
 
 `;
 
+// src/runtime-profile-compose-build.ts
+var starterServerBuild = `    build:
+      context: .
+      dockerfile: apps/server/Dockerfile
+      args:
+        WINDY_DEBIAN_MIRROR: \${WINDY_DEBIAN_MIRROR:-http://mirrors.aliyun.com/debian}
+        WINDY_DEBIAN_SECURITY_MIRROR: \${WINDY_DEBIAN_SECURITY_MIRROR:-http://mirrors.aliyun.com/debian-security}`;
+
 // src/runtime-profile-files.ts
 var starterComposeBase = `services:
   postgres:
@@ -2851,9 +2859,7 @@ var starterComposeBase = `services:
       retries: 5
 
   migrate:
-    build:
-      context: .
-      dockerfile: apps/server/Dockerfile
+${starterServerBuild}
     command: ["bun", "run", "db:migrate"]
     environment:
       DATABASE_URL: postgresql://windy:\${POSTGRES_PASSWORD}@postgres:5432/windy
@@ -2864,9 +2870,7 @@ var starterComposeBase = `services:
         condition: service_healthy
 
   server:
-    build:
-      context: .
-      dockerfile: apps/server/Dockerfile
+${starterServerBuild}
     command: ["bun", "run", "--cwd", "apps/server", "dev"]
     environment:
       NODE_ENV: development
@@ -2942,9 +2946,7 @@ __OPTIONAL_VOLUMES__
 `;
 var agentComposeService = `  tool-sandbox-init:
     profiles: ["agent"]
-    build:
-      context: .
-      dockerfile: apps/server/Dockerfile
+${starterServerBuild}
     user: "0:0"
     command:
       [
@@ -2965,9 +2967,7 @@ var agentComposeService = `  tool-sandbox-init:
 
   tool-sandbox:
     profiles: ["agent"]
-    build:
-      context: .
-      dockerfile: apps/server/Dockerfile
+${starterServerBuild}
     command: ["bun", "run", "apps/server/src/agent/sandbox-worker.ts"]
     environment:
       TOOL_SANDBOX_SOCKET: /run/windy-tool-sandbox/worker.sock
@@ -7762,6 +7762,11 @@ var recipes = [
     id: "starter-0.6.1-to-0.6.2",
     from: "0.6.1",
     to: "0.6.2"
+  },
+  {
+    id: "starter-0.6.2-to-0.6.3",
+    from: "0.6.2",
+    to: "0.6.3"
   }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "84241696bdbcd7d44ab4339aeb3c90af6df936e1",
-  "generatorVersion": "0.6.2",
+  "templateCommit": "9dd151f4a0b95e2f7004aa34b97790b645e1bbb7",
+  "generatorVersion": "0.6.3",
   "modules": [
     {
       "name": "system",

package/template/apps/server/Dockerfile

@@ -23,14 +23,19 @@ COPY packages/server-sdk/package.json packages/server-sdk/package.json
 COPY packages/shared/package.json packages/shared/package.json
 COPY packages/storage/package.json packages/storage/package.json
 # windy-copy:deps end
-RUN --mount=type=cache,id=windy-bun-1.3.14,target=/root/.bun/install/cache,sharing=shared bun -e 'const child=Bun.spawn(["bun","install","--frozen-lockfile","--no-progress","--backend=copyfile","--linker=hoisted"],{stdin:"inherit",stdout:"inherit",stderr:"inherit"});const heartbeat=setInterval(()=>console.log("[windy] Bun 依赖安装仍在进行"),15000);const exitCode=await child.exited;clearInterval(heartbeat);process.exit(exitCode)'
+RUN --mount=type=cache,id=windy-bun-1.3.14,target=/root/.bun/install/cache,sharing=shared bun -e 'const child=Bun.spawn(["bun","install","--frozen-lockfile","--no-progress","--backend=copyfile","--linker=hoisted","--ignore-scripts"],{stdin:"inherit",stdout:"inherit",stderr:"inherit"});const heartbeat=setInterval(()=>console.log("[windy] Bun 依赖安装仍在进行"),15000);const exitCode=await child.exited;clearInterval(heartbeat);process.exit(exitCode)' && bun --cwd apps/server -e 'await import("argon2")'
 
 FROM deps AS runner
 # @windy-module system.storage begin
 # The native archive helper needs a compiler. Avoid Alpine apk here: its source
 # transfer can stall indefinitely under cross-architecture BuildKit emulation.
+ARG WINDY_DEBIAN_MIRROR=http://deb.debian.org/debian
+ARG WINDY_DEBIAN_SECURITY_MIRROR=http://deb.debian.org/debian-security
 RUN set -eu; \
-    if ! timeout --kill-after=5s 90s sh -c 'apt-get update -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 -o Acquire::Retries=0 && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes build-essential libarchive-dev libarchive-tools'; then \
+    echo "$WINDY_DEBIAN_MIRROR" | grep -Eq '^https?://[A-Za-z0-9./:_-]+$'; \
+    echo "$WINDY_DEBIAN_SECURITY_MIRROR" | grep -Eq '^https?://[A-Za-z0-9./:_-]+$'; \
+    sed -i "s|http://deb.debian.org/debian-security|$WINDY_DEBIAN_SECURITY_MIRROR|g; s|http://deb.debian.org/debian|$WINDY_DEBIAN_MIRROR|g" /etc/apt/sources.list.d/debian.sources; \
+    if ! timeout --kill-after=5s 90s sh -c 'apt-get update -o Acquire::http::AllowRedirect=false -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 -o Acquire::Retries=0 && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes build-essential libarchive-dev libarchive-tools'; then \
       echo "APT 包源不可用或 90 秒总时限已到：无法安装 report-staging 依赖" >&2; exit 70; \
     fi
 # @windy-module system.storage end

package/template/apps/web/Dockerfile

@@ -23,7 +23,7 @@ COPY packages/server-sdk/package.json packages/server-sdk/package.json
 COPY packages/shared/package.json packages/shared/package.json
 COPY packages/storage/package.json packages/storage/package.json
 # windy-copy:deps end
-RUN --mount=type=cache,id=windy-bun-1.3.14,target=/root/.bun/install/cache,sharing=shared bun -e 'const child=Bun.spawn(["bun","install","--frozen-lockfile","--no-progress","--backend=copyfile","--linker=hoisted"],{stdin:"inherit",stdout:"inherit",stderr:"inherit"});const heartbeat=setInterval(()=>console.log("[windy] Bun 依赖安装仍在进行"),15000);const exitCode=await child.exited;clearInterval(heartbeat);process.exit(exitCode)'
+RUN --mount=type=cache,id=windy-bun-1.3.14,target=/root/.bun/install/cache,sharing=shared bun -e 'const child=Bun.spawn(["bun","install","--frozen-lockfile","--no-progress","--backend=copyfile","--linker=hoisted","--ignore-scripts"],{stdin:"inherit",stdout:"inherit",stderr:"inherit"});const heartbeat=setInterval(()=>console.log("[windy] Bun 依赖安装仍在进行"),15000);const exitCode=await child.exited;clearInterval(heartbeat);process.exit(exitCode)' && bun --cwd apps/server -e 'await import("argon2")'
 
 FROM deps AS build
 # windy-copy:build begin

package/template/docker-compose.yml

@@ -19,6 +19,9 @@ services:
     build:
       context: .
       dockerfile: apps/server/Dockerfile
+      args:
+        WINDY_DEBIAN_MIRROR: ${WINDY_DEBIAN_MIRROR:-http://mirrors.aliyun.com/debian}
+        WINDY_DEBIAN_SECURITY_MIRROR: ${WINDY_DEBIAN_SECURITY_MIRROR:-http://mirrors.aliyun.com/debian-security}
     command: ["bun", "run", "db:migrate"]
     environment:
       DATABASE_URL: postgresql://windy:${POSTGRES_PASSWORD}@postgres:5432/windy
@@ -32,6 +35,9 @@ services:
     build:
       context: .
       dockerfile: apps/server/Dockerfile
+      args:
+        WINDY_DEBIAN_MIRROR: ${WINDY_DEBIAN_MIRROR:-http://mirrors.aliyun.com/debian}
+        WINDY_DEBIAN_SECURITY_MIRROR: ${WINDY_DEBIAN_SECURITY_MIRROR:-http://mirrors.aliyun.com/debian-security}
     command: ["bun", "run", "--cwd", "apps/server", "dev"]
     environment:
       NODE_ENV: development
@@ -100,6 +106,9 @@ services:
     build:
       context: .
       dockerfile: apps/server/Dockerfile
+      args:
+        WINDY_DEBIAN_MIRROR: ${WINDY_DEBIAN_MIRROR:-http://mirrors.aliyun.com/debian}
+        WINDY_DEBIAN_SECURITY_MIRROR: ${WINDY_DEBIAN_SECURITY_MIRROR:-http://mirrors.aliyun.com/debian-security}
     user: "0:0"
     command:
       [
@@ -123,6 +132,9 @@ services:
     build:
       context: .
       dockerfile: apps/server/Dockerfile
+      args:
+        WINDY_DEBIAN_MIRROR: ${WINDY_DEBIAN_MIRROR:-http://mirrors.aliyun.com/debian}
+        WINDY_DEBIAN_SECURITY_MIRROR: ${WINDY_DEBIAN_SECURITY_MIRROR:-http://mirrors.aliyun.com/debian-security}
     command: ["bun", "run", "apps/server/src/agent/sandbox-worker.ts"]
     environment:
       TOOL_SANDBOX_SOCKET: /run/windy-tool-sandbox/worker.sock