Merge branch 'main' of https://github.com/ATLAS-PJK-GM007/ZeaVis-Edu into selly/frontend

This commit is contained in:
seriouselly
2026-06-15 01:27:13 +07:00
2 changed files with 3 additions and 11 deletions
+2 -6
View File
@@ -1,14 +1,10 @@
FROM oven/bun:1.3.14 AS deps
WORKDIR /app
COPY package.json bun.lock bunfig.toml tsconfig.base.json ./
COPY package.json bunfig.toml tsconfig.base.json ./
COPY apps/api/package.json apps/api/package.json
COPY apps/web/package.json apps/web/package.json
COPY packages/shared/package.json packages/shared/package.json
<<<<<<< HEAD
=======
ENV BUN_INSTALL_FROZEN_LOCKFILE=0
>>>>>>> 02ae0221749491518468e6bd9c56084f9687cd34
RUN bun install --production
FROM oven/bun:1.3.14 AS runner
@@ -17,7 +13,7 @@ ENV NODE_ENV=production
ENV API_PORT=3000
COPY --from=deps /app/node_modules ./node_modules
COPY package.json bun.lock bunfig.toml tsconfig.base.json ./
COPY package.json bunfig.toml tsconfig.base.json ./
COPY apps/api apps/api
COPY packages/shared packages/shared
+1 -5
View File
@@ -1,14 +1,10 @@
FROM oven/bun:1.3.14 AS builder
WORKDIR /app
COPY package.json bun.lock bunfig.toml tsconfig.base.json ./
COPY package.json bunfig.toml tsconfig.base.json ./
COPY packages/shared/package.json packages/shared/package.json
COPY apps/web/package.json apps/web/package.json
COPY apps/api/package.json apps/api/package.json
<<<<<<< HEAD
=======
ENV BUN_INSTALL_FROZEN_LOCKFILE=0
>>>>>>> 02ae0221749491518468e6bd9c56084f9687cd34
RUN bun install
COPY packages/shared packages/shared