Merge branch 'main' into dev

nbtca · Aug 13, 2024 · 886de23 · 886de23
2 parents 830ef4a + 78e08cc
commit 886de23
Show file tree

Hide file tree

Showing 9 changed files with 1,172 additions and 16,517 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: deploy
 on:
   push:
     branches:
-      - v2
+      - main
 
 env:
   REGISTRY: ghcr.io

diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
-FROM node as build
-
+FROM node:20-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
 COPY . /app
 WORKDIR /app
 
-RUN npm install &&\
-  npm run build
-
+FROM base AS build
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
+RUN pnpm run build
 
 FROM nginx:alpine as deploy
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: deploy @@
     on:
       push:
         branches:
-          - v2
+          - main
     env:
       REGISTRY: ghcr.io
@@ Expand Down @@