docker 部署优化

deployment.sh

@@ -4,13 +4,17 @@
 current_git_branch_latest_short_id=`git rev-parse --short HEAD`
 version=$(grep '"version"' package.json | sed -E 's/.*"version": "([^"]+)".*/\1/')
 project_name=$(grep '"name"' package.json | sed -E 's/.*"name": "([^"]+)".*/\1/')
-docker_name="$project_name:$version-$current_git_branch_latest_short_id"
-save_file_name="$version-$current_git_branch_latest_short_id.tar"
+# docker_name="$project_name:$version-$current_git_branch_latest_short_id"
+docker_name="new_cash_book_node:$version-$current_git_branch_latest_short_id"
+save_file_name="new_cash_book_node_$version-$current_git_branch_latest_short_id.tar"
 
 # 执行命令
-cd ./frontEndMobile && npm run build
+cd ./frontEndMobile
+yarn install --registry=https://registry.npmmirror.com && npm run build
 rm -rf ../node_expores/public
 cp -rf ./dist ../node_expores/public
-# docker build -t $docker_name .
-# cd ../
-# docker save -o ./$save_file_name $docker_name
+cd ../node_expores
+yarn install --registry=https://registry.npmmirror.com
+docker build -t $docker_name .
+cd ../
+docker save -o ./$save_file_name $docker_name

node_expores/Dockerfile

@@ -1,27 +1,8 @@
-# 使用 node 18 作为基础镜像
 FROM node:18.20.4
-
-# 设置工作目录
 WORKDIR /app
-
-# 安装 yarn@1
-# RUN npm install -g yarn@1 --registry=https://registry.npmmirror.com
-
-# 将 package.json 和 yarn.lock 拷贝到容器中
-# COPY package.json yarn.lock ./
 COPY package*.json ./
-
-# 安装依赖，并设置国内镜像
 RUN npm install
-
-# 拷贝项目的所有文件到容器中
 COPY . .
-
-# 对外暴露 8080 端口
 EXPOSE 3000
-
-# 设置 files 目录为一个卷，以便于数据持久化或文件共享
 VOLUME /app/base_files
-
-# 启动应用（根据您项目的启动命令修改）
 CMD ["node", "app.js"]

node_expores/environment/index.js

@@ -1,19 +1,19 @@
 function dbInfo() {
   // 根据需要更新db的数据配置
-  return {
-    host: "localhost",
-    port: 3306,
-    user: "root",
-    password: "12345678",
-    database: "cashbook",
-  };
   // return {
-  //   host: "192.168.2.103",
-  //   port: 6806,
+  //   host: "localhost",
+  //   port: 3306,
   //   user: "root",
-  //   password: "admin",
+  //   password: "12345678",
   //   database: "cashbook",
   // };
+  return {
+    host: "192.168.2.103",
+    port: 6806,
+    user: "root",
+    password: "admin",
+    database: "cashbook",
+  };
 }
 
 

node_expores/yarn.lock

@@ -219,11 +219,6 @@ crypto@^1.0.1:
   resolved "https://registry.npmmirror.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037"
   integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==
 
-dayjs-plugin-utc@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmmirror.com/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz#48e552407024143922d6499a40f6c765f8c93d03"
-  integrity sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg==
-
 dayjs@^1.11.13:
   version "1.11.13"
   resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
@@ -638,9 +633,9 @@ object-assign@^4:
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.13.1:
-  version "1.13.2"
-  resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
-  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
+  version "1.13.3"
+  resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
+  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
 
 on-finished@2.4.1:
   version "2.4.1"
@@ -854,9 +849,9 @@ utils-merge@1.0.1:
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.npmmirror.com/uuid/-/uuid-11.0.2.tgz#a8d68ba7347d051e7ea716cc8dcbbab634d66875"
-  integrity sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==
+  version "11.0.3"
+  resolved "https://registry.npmmirror.com/uuid/-/uuid-11.0.3.tgz#248451cac9d1a4a4128033e765d137e2b2c49a3d"
+  integrity sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"