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:09:04 +07:00
3 changed files with 112 additions and 93 deletions
+4
View File
@@ -5,6 +5,10 @@ COPY package.json bun.lock 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
+4
View File
@@ -5,6 +5,10 @@ COPY package.json bun.lock 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