agent_coder
044daab357
Схлопнутая дельта feat/git-sync-2 поверх актуального develop (3085ec1b). Почему squash, а не буквальный rebase: в ветке 113 коммитов, из которых develop уже впитал ~80 в курированном виде при унификации конвертера (#326/#293) — но не patch-identical, поэтому они не отваливаются сами; а коммит, УДАЛЯЮЩИЙ вендоренную копию конвертера, апстримный и в replay-набор не входит, так что наивный replay заново добавил бы вендоренные копии. Поэтому корректный итог — «develop + чистая net-дельта ветки», сведённая 3-way мержом (merge-base5336f06d). Net-дельта: серверный git-sync модуль (GitSyncModule/orchestrator/HTTP), движок git-sync (layout/reconcile/pull/push/stabilize + QA), два фикса round-trip/data-loss конвертера поверх УНИФИЦИРОВАННОГО @docmost/prosemirror-markdown (вендоренной копии больше нет — git-sync целиком на унифицированном конвертере, поведение унифицированного принято за эталон), e2e-скрипты, доки. Конфликты (4) слиты объединением: main.ts (метрики + GitHttpService), apps/server/package.json (pretest-суперсет; moduleNameMapper: git-sync→src и .js-strip оставлены, а bare-specifier @docmost/prosemirror-markdown→src УБРАН — серверный jest выровнен на develop-подход #345 со сборённым пакетом), .env.example (метрики + GIT_SYNC блоки), AGENTS.md (строки про пакеты; устаревшая заметка про «три hand-synced копии схемы» в git-sync поправлена — схема теперь только в @docmost/prosemirror-markdown). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
92 lines
3.7 KiB
Docker
92 lines
3.7 KiB
Docker
FROM node:22-slim AS base
|
|
LABEL org.opencontainers.image.source="https://github.com/vvzvlad/gitmost"
|
|
|
|
RUN npm install -g pnpm@10.4.0
|
|
|
|
FROM base AS builder
|
|
|
|
# re2 (packages/mcp) always compiles from source under pnpm (the prebuilt-binary
|
|
# download cannot identify the GitHub repo), so node-gyp needs python3/make/g++.
|
|
# This stage is discarded, so the toolchain can stay installed.
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends python3 make g++ \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
|
|
COPY . .
|
|
|
|
RUN pnpm install --frozen-lockfile
|
|
# Version string shown in the UI (computed outside Docker because .git is not in the build context).
|
|
ARG APP_VERSION=""
|
|
ENV APP_VERSION=$APP_VERSION
|
|
RUN pnpm build
|
|
|
|
FROM base AS installer
|
|
|
|
# git: required by the git-sync VaultGit (shells out to git)
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends curl bash git \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
|
|
# Agent-roles catalog base URL: per-branch default set at build time (CI);
|
|
# overridable at runtime via the AI_AGENT_ROLES_CATALOG_URL env var.
|
|
ARG AI_AGENT_ROLES_CATALOG_URL=""
|
|
ENV AI_AGENT_ROLES_CATALOG_URL=$AI_AGENT_ROLES_CATALOG_URL
|
|
|
|
# Copy apps
|
|
COPY --from=builder /app/apps/server/dist /app/apps/server/dist
|
|
COPY --from=builder /app/apps/client/dist /app/apps/client/dist
|
|
COPY --from=builder /app/apps/server/package.json /app/apps/server/package.json
|
|
|
|
# Copy packages
|
|
COPY --from=builder /app/packages/editor-ext/dist /app/packages/editor-ext/dist
|
|
COPY --from=builder /app/packages/editor-ext/package.json /app/packages/editor-ext/package.json
|
|
COPY --from=builder /app/packages/mcp/build /app/packages/mcp/build
|
|
COPY --from=builder /app/packages/mcp/package.json /app/packages/mcp/package.json
|
|
# @docmost/prosemirror-markdown is the shared converter (#293/#326). Both mcp and
|
|
# git-sync depend on it (workspace:*) and load it at runtime, so the built package +
|
|
# its manifest must be shipped or the prod install resolves a broken workspace
|
|
# symlink and every consumer dies with ERR_MODULE_NOT_FOUND.
|
|
COPY --from=builder /app/packages/prosemirror-markdown/build /app/packages/prosemirror-markdown/build
|
|
COPY --from=builder /app/packages/prosemirror-markdown/package.json /app/packages/prosemirror-markdown/package.json
|
|
# git-sync: the server loads @docmost/git-sync at runtime via the loader
|
|
# (git-sync.loader.ts), which deliberately does NOT `require()` it — the package is
|
|
# ESM-only, so the loader uses `require.resolve` + a dynamic `import()`. Without
|
|
# these copied build artifacts that resolve/import fails and the server crashes on
|
|
# first use. Built fresh by the builder's `pnpm build` (nx builds the package's tsc
|
|
# `build` target). This branch (#119) is where git-sync gains its runtime consumer.
|
|
COPY --from=builder /app/packages/git-sync/build /app/packages/git-sync/build
|
|
COPY --from=builder /app/packages/git-sync/package.json /app/packages/git-sync/package.json
|
|
|
|
# Copy root package files
|
|
COPY --from=builder /app/package.json /app/package.json
|
|
COPY --from=builder /app/pnpm*.yaml /app/
|
|
COPY --from=builder /app/.npmrc /app/.npmrc
|
|
|
|
# Copy patches
|
|
COPY --from=builder /app/patches /app/patches
|
|
|
|
RUN chown -R node:node /app
|
|
|
|
# Toolchain is needed transiently to compile re2 during the prod install; install
|
|
# and purge it in one layer to keep the final image slim. The install itself runs
|
|
# as the node user via su to keep node_modules ownership without a costly chown layer.
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends python3 make g++ \
|
|
&& su node -c "pnpm install --frozen-lockfile --prod" \
|
|
&& apt-get purge -y --auto-remove python3 make g++ \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
USER node
|
|
|
|
RUN mkdir -p /app/data/storage
|
|
|
|
VOLUME ["/app/data/storage"]
|
|
|
|
EXPOSE 3000
|
|
|
|
CMD ["pnpm", "start"]
|