Upgrade to v0.39.0: reapply fork patches on clean upstream base
Some checks failed
PR Checks / Lint (push) Has been cancelled
PR Checks / Typecheck (push) Has been cancelled
PR Checks / Build (push) Has been cancelled
PR Checks / Test shard 1/4 (push) Has been cancelled
PR Checks / Test shard 2/4 (push) Has been cancelled
PR Checks / Test shard 3/4 (push) Has been cancelled
PR Checks / Test shard 4/4 (push) Has been cancelled
Some checks failed
PR Checks / Lint (push) Has been cancelled
PR Checks / Typecheck (push) Has been cancelled
PR Checks / Build (push) Has been cancelled
PR Checks / Test shard 1/4 (push) Has been cancelled
PR Checks / Test shard 2/4 (push) Has been cancelled
PR Checks / Test shard 3/4 (push) Has been cancelled
PR Checks / Test shard 4/4 (push) Has been cancelled
Strategy: reset main to upstream/main (v0.39.0) and reapply only the fork-specific patches that survive — most older patches (plugin-loader routing, heartbeat resolver, autoload, cross-spawn, scope-resolution fixes) were absorbed by upstream between v0.28.1 → v0.39.0. Surviving patches: - Dockerfile: keep single-stage Coolify-compatible build (upstream went multi-stage which breaks our bind-mount strategy for /home/s/.codex, /home/s/.claude, /usr/lib/node_modules) - packages/engine/src/sandbox-tester-gate.ts: shared Phase-3 pre-merge gate module (Opus 4.7 + OpenSandbox + Playwright smoke) - packages/engine/src/executor.ts: call runSandboxTesterGate from finalizeAlreadyReviewedTask recovery path - packages/engine/src/project-engine.ts: call applySandboxTesterGate from primary direct-merge dispatch (the path that actually fires in prod — recovery path only catches stuck tasks) - packages/dashboard/src/auth-middleware.ts: registerPluginExemptPath for webhook endpoints (Grafana, Gitea) that must bypass daemon-token - packages/dashboard/src/plugin-routes.ts: auto-register plugin-defined routes as daemon-exempt so external plugins (telemetry-watcher, gitea-issues) work out of the box Tested locally: pnpm install + pnpm -r build green, no TS errors. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
78
Dockerfile
78
Dockerfile
@@ -1,88 +1,40 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM node:22-slim AS builder
|
||||
WORKDIR /app
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends git build-essential python3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
|
||||
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||
COPY packages/cli/package.json ./packages/cli/package.json
|
||||
COPY packages/cli-alias/package.json ./packages/cli-alias/package.json
|
||||
COPY packages/core/package.json ./packages/core/package.json
|
||||
COPY packages/dashboard/package.json ./packages/dashboard/package.json
|
||||
COPY packages/desktop/package.json ./packages/desktop/package.json
|
||||
COPY packages/droid-cli/package.json ./packages/droid-cli/package.json
|
||||
COPY packages/engine/package.json ./packages/engine/package.json
|
||||
COPY packages/mobile/package.json ./packages/mobile/package.json
|
||||
COPY packages/pi-claude-cli/package.json ./packages/pi-claude-cli/package.json
|
||||
COPY packages/pi-llama-cpp/package.json ./packages/pi-llama-cpp/package.json
|
||||
COPY packages/plugin-sdk/package.json ./packages/plugin-sdk/package.json
|
||||
COPY plugins/examples/fusion-plugin-auto-label/package.json ./plugins/examples/fusion-plugin-auto-label/package.json
|
||||
COPY plugins/examples/fusion-plugin-ci-status/package.json ./plugins/examples/fusion-plugin-ci-status/package.json
|
||||
COPY plugins/examples/fusion-plugin-notification/package.json ./plugins/examples/fusion-plugin-notification/package.json
|
||||
COPY plugins/examples/fusion-plugin-settings-demo/package.json ./plugins/examples/fusion-plugin-settings-demo/package.json
|
||||
COPY plugins/fusion-plugin-paperclip-runtime/package.json ./plugins/fusion-plugin-paperclip-runtime/package.json
|
||||
COPY plugins/fusion-plugin-dependency-graph/package.json ./plugins/fusion-plugin-dependency-graph/package.json
|
||||
COPY plugins/fusion-plugin-cli-printing-press/package.json ./plugins/fusion-plugin-cli-printing-press/package.json
|
||||
COPY plugins/fusion-plugin-openclaw-runtime/package.json ./plugins/fusion-plugin-openclaw-runtime/package.json
|
||||
COPY plugins/fusion-plugin-hermes-runtime/package.json ./plugins/fusion-plugin-hermes-runtime/package.json
|
||||
COPY plugins/fusion-plugin-droid-runtime/package.json ./plugins/fusion-plugin-droid-runtime/package.json
|
||||
COPY plugins/fusion-plugin-cursor-runtime/package.json ./plugins/fusion-plugin-cursor-runtime/package.json
|
||||
COPY plugins/fusion-plugin-agent-browser/package.json ./plugins/fusion-plugin-agent-browser/package.json
|
||||
COPY plugins/fusion-plugin-whatsapp-chat/package.json ./plugins/fusion-plugin-whatsapp-chat/package.json
|
||||
COPY plugins/fusion-plugin-roadmap/package.json ./plugins/fusion-plugin-roadmap/package.json
|
||||
COPY plugins/fusion-plugin-even-realities-glasses/package.json ./plugins/fusion-plugin-even-realities-glasses/package.json
|
||||
COPY plugins/fusion-plugin-reports/package.json ./plugins/fusion-plugin-reports/package.json
|
||||
|
||||
RUN pnpm install --frozen-lockfile
|
||||
|
||||
COPY . .
|
||||
RUN pnpm build
|
||||
|
||||
FROM node:22-slim AS runner
|
||||
LABEL org.opencontainers.image.source="https://github.com/gsxdsm/fusion"
|
||||
FROM node:22-slim
|
||||
LABEL org.opencontainers.image.source="https://github.com/Runfusion/Fusion"
|
||||
LABEL org.opencontainers.image.description="AI-orchestrated task board"
|
||||
|
||||
ENV NODE_ENV=production
|
||||
ENV PORT=4040
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends git \
|
||||
&& apt-get install -y --no-install-recommends git build-essential python3 curl ca-certificates \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
|
||||
|
||||
WORKDIR /project
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||
COPY packages/cli/package.json ./packages/cli/package.json
|
||||
COPY packages/core/package.json ./packages/core/package.json
|
||||
COPY packages/dashboard/package.json ./packages/dashboard/package.json
|
||||
COPY packages/engine/package.json ./packages/engine/package.json
|
||||
COPY packages ./packages
|
||||
COPY plugins ./plugins
|
||||
|
||||
RUN pnpm install --frozen-lockfile --prod \
|
||||
--filter @runfusion/fusion
|
||||
RUN pnpm install --frozen-lockfile
|
||||
|
||||
COPY --from=builder /app/packages/core/dist ./packages/core/dist
|
||||
COPY --from=builder /app/packages/engine/dist ./packages/engine/dist
|
||||
COPY --from=builder /app/packages/dashboard/dist ./packages/dashboard/dist
|
||||
COPY --from=builder /app/packages/cli/dist ./packages/cli/dist
|
||||
COPY . .
|
||||
RUN pnpm build
|
||||
|
||||
# @runfusion/fusion references typebox at runtime via the bundled CLI.
|
||||
COPY --from=builder /app/node_modules/.pnpm/typebox@*/node_modules/typebox /project/node_modules/typebox
|
||||
RUN mkdir -p /project && chown -R node:node /project /app
|
||||
|
||||
RUN chown node:node /project
|
||||
RUN ln -s /usr/lib/node_modules/@openai/codex/bin/codex.js /usr/local/bin/codex
|
||||
|
||||
USER node
|
||||
WORKDIR /project
|
||||
|
||||
EXPOSE 4040
|
||||
|
||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
|
||||
CMD node -e "fetch('http://localhost:4040/api/health').then(r => process.exit(r.ok ? 0 : 1)).catch(() => process.exit(1))"
|
||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
|
||||
CMD curl -fsS -o /dev/null http://localhost:4040/ || exit 1
|
||||
|
||||
ENTRYPOINT ["node", "packages/cli/dist/bin.js"]
|
||||
ENTRYPOINT ["node", "/app/packages/cli/dist/bin.js"]
|
||||
CMD ["dashboard", "--host", "0.0.0.0"]
|
||||
|
||||
Reference in New Issue
Block a user