feat: save

.dockerignore

@@ -1,3 +1,5 @@
 node_modules
 **/node_modules
-**/*/node_modules
+**/*/node_modules
+pnpm-lock.yaml
+**/*/pnpm-lock.yaml

docker-compose.mu.yml

@@ -1,17 +1,31 @@
 services:
   backend:
-    image: gemer/helper_backend:latest
+    build:
+      dockerfile: docker/backend/Dockerfile
+      context: .
+    # image: helper_backend:1.1
     environment:
       NODE_ENV: "production"
       DB_HOST: "192.168.10.82" # 设置 root 用户密码
       DB_PWD: "gemer...123"
       DB_USER: "gemer"
       DB_DATABASE: "helper_center"
+      # REDIS_URL: "redis://192.168.10.82:63790"
       REDIS_URL: "redis://redis:6379"
     networks:
       - backend
     ports:
       - "8085:8085"
+  frontend:
+    # image: gemer/helper_frontend:latest
+    # build: docker/frontend/Dockerfile
+    build:
+      dockerfile: docker/frontend/Dockerfile
+      context: .
+    ports:
+      - "8080:80"
+    networks:
+      - backend
   redis:
     image: redis:latest
     # command: --requirepass "12345678"  # Uncomment if you need a password
@@ -24,7 +38,6 @@ services:
       - backend
     ports:
       - 6379:6379
-
 networks:
   backend:
     driver: bridge

docker-compose.yml

@@ -1,6 +1,9 @@
 services:
   backend:
-    image: gemer/helper_backend:latest
+    build:
+      dockerfile: docker/backend/Dockerfile
+      context: .
+    # image: helper_backend:1.1
     environment:
       NODE_ENV: "production"
       DB_HOST: "192.168.10.82" # 设置 root 用户密码
@@ -13,7 +16,11 @@ services:
     ports:
       - "8085:8085"
   frontend:
-    image: gemer/helper_frontend:latest
+    # image: gemer/helper_frontend:latest
+    # build: docker/frontend/Dockerfile
+    build:
+      dockerfile: docker/frontend/Dockerfile
+      context: .
     ports:
       - "8080:80"
     networks:

docker/backend/Dockerfile

@@ -0,0 +1,26 @@
+FROM node:20-alpine
+
+# ENV NODE_ENV=production
+ENV APP_PORT=8085
+ENV DB_HOST=127.0.0.1
+ENV DB_USER=root
+ENV DB_PWD=""
+ENV DB_DATABASE=4dkankan_motion
+ENV REDIS_URL=''
+ENV OSS_DOMAIN=https://ossxiaoan.4dage.com
+ENV OSS_FOLDER=/helperCenter
+
+WORKDIR /usr/src/app
+COPY ./packages/backend /usr/src/app
+
+RUN cd ${WORKDIR}
+# RUN npm install pnpm -g
+RUN npm config set registry https://registry.npmmirror.com
+RUN npm install pm2 -g
+RUN npm install
+RUN npm run build
+
+EXPOSE ${APP_PORT}
+
+CMD ["pm2-runtime", "ecosystem.config.js"]
+# CMD ["npm", "run", "pm2:start"]

docker/frontend/Dockerfile

@@ -11,8 +11,9 @@ RUN pnpm config set registry https://registry.npmmirror.com
 RUN cd ${WORKDIR}
 RUN pnpm install
 # 构建生产环境静态文件
+RUN  pnpm run build-web
 RUN pnpm run build-backend-html
-# RUN  pnpm run build-web
+
 # 使用 Nginx 镜像作为运行时
 FROM nginx:alpine
 
@@ -20,6 +21,7 @@ FROM nginx:alpine
 COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
 
 # 从构建阶段复制静态文件到 Nginx 的默认静态文件目录
+COPY --from=build-stage /app/packages/web/dist /usr/share/nginx/html
 COPY --from=build-stage /app/packages/frontend/dist /usr/share/nginx/html/admin
 
 # 暴露 80 端口

packages/backend/Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /usr/src/app
 COPY ./ /usr/src/app
 
 RUN cd ${WORKDIR}
-RUN npm install pnpm -g
+# RUN npm install pnpm -g
 RUN npm install pm2 -g
 RUN pnpm install
 RUN npm run build

packages/web/components.d.ts

@@ -9,7 +9,6 @@ declare module 'vue' {
   export interface GlobalComponents {
     Footer: typeof import('./src/components/footer.vue')['default']
     Header: typeof import('./src/components/header.vue')['default']
-    HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SubHeader: typeof import('./src/components/subHeader.vue')['default']

packages/web/src/main.ts

@@ -4,7 +4,7 @@ import App from '@/App.vue'
 import router from '@/plugins/router'
 import i18n from '@/plugins/i18n'
 import 'uno.css'
-import '@unocss/reset/normalize.css'
+// import '@unocss/reset/normalize.css'
 
 const app = createApp(App)