修改docker的配置

.gitlab-ci.yml

+variables:
+  NANGAO_BASE_IMAGE: "$CI_REGISTRY/nangao-iot/nangao-base"
+  VS_SOCKETIO_IMAGE: "$CI_REGISTRY/nangao-iot/vs_socket_backend"
+  VS_SOCKETIO_BASE_IMAGE: "$CI_REGISTRY/nangao-iot/SOCKETIO_MIDDLEWARE-base"
+
+vs-socketio-base:
+  image: $NANGAO_BASE_IMAGE
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build -f ./Dockerfile_base -t $TASKS_BASE_IMAGE .
+    - docker push $TASKS_BASE_IMAGE
+  when: manual
+
+
+
+vs-socketio-backend-dev:
+  image: $NANGAO_BASE_IMAGE
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build -f ./Dockerfile_backend_dev -t "$VS_SOCKETIO_IMAGE"-dev .
+    - docker push "$VS_SOCKETIO_IMAGE"-dev
+  only:
+    changes:
+      - utools_backend/**/*
+
+
+vs-socketio-backend-prod:
+  image: $NANGAO_BASE_IMAGE
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build -f ./Dockerfile_backend_prod -t "$VS_SOCKETIO_IMAGE"-prod .
+    - docker push "$VS_SOCKETIO_IMAGE"-prod
+  only:
+    changes:
+      - utools_backend/**/*
+
+#发布到测试环境
+deploy_test:
+  stage: deploy
+  image: $NANGAO_BASE_IMAGE
+  services:
+    - docker:dind
+  before_script:
+    - mkdir -p ~/.ssh
+    - eval $(ssh-agent -s)
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+    - ssh-add <(echo "$PRIVATE_KEY")
+  script:
+    - rsync -Phvz -e "ssh -p 6001" ./docker-compose-dev.yaml root@$DEV_IP:/root/docker-compose/vs_socketio_backend/docker-compose.yaml
+    - ssh -p 6001 $DEV_IP 'cd /root/docker-compose/vs_socket_backend; docker-compose pull vs_socketio_backend;docker-compose up -d --build vs_socketio_backend;docker-compose up -d '
+
+#发布到正式环境
+deploy_prod:
+  stage: deploy
+  image: $NANGAO_BASE_IMAGE
+  services:
+    - docker:dind
+  before_script:
+    - mkdir -p ~/.ssh
+    - eval $(ssh-agent -s)
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+    - ssh-add <(echo "$PRIVATE_KEY")
+  script:
+    - rsync -Phvz -e "ssh" ./docker-compose-prod.yaml root@$PROD_IP:/root/docker-compose/vs_socket_backend/docker-compose.yaml
+    - ssh $PROD_IP 'cd /root/docker-compose/vs_socketio_backend; docker-compose pull vs_socketio_backend; docker-compose up -d '
+  when: manual

config/config.default.js

@@ -48,10 +48,10 @@ module.exports = appInfo => {
       },
     },
     redis: {
-      host: 'localhost',
+      host: '192.168.40.2',
       port: 6379,
-      // auth_pass: '123456',
-      // db: 0,
+      auth_pass: 'nangao',
+      db: 8,
     },
   };
 

docker/Dockerfile_backend_dev

+# 环境
+FROM swr.cn-north-4.myhuaweicloud.com/nangao-iot/SOCKETIO_MIDDLEWARE-base AS build-env
+USER root
+
+ENV SRC_HOME=/root/src
+RUN mkdir -p $SRC_HOME
+
+# 复制源代码
+ADD . $SRC_HOME/
+
+WORKDIR $SRC_HOME/vs_socket_backend
+
+RUN yarn
+
+ENTRYPOINT [ "sh", "-c","npm run dev " ]

docker/Dockerfile_backend_prod

+# 环境
+FROM swr.cn-north-4.myhuaweicloud.com/nangao-iot/SOCKETIO_MIDDLEWARE-base AS build-env
+USER root
+
+ENV SRC_HOME=/root/src
+RUN mkdir -p $SRC_HOME
+
+# 复制源代码
+ADD . $SRC_HOME/
+
+WORKDIR $SRC_HOME/vs_socket_backend
+
+RUN yarn
+
+ENTRYPOINT [ "sh", "-c","npm run dev " ]

docker/Dockerfile_backend_test

+# 环境
+FROM swr.cn-north-4.myhuaweicloud.com/nangao-iot/SOCKETIO_MIDDLEWARE-base AS build-env
+USER root
+
+ENV SRC_HOME=/root/src
+RUN mkdir -p $SRC_HOME
+
+# 复制源代码
+ADD . $SRC_HOME/
+
+WORKDIR $SRC_HOME/vs_socket_backend
+
+RUN yarn
+
+ENTRYPOINT [ "sh", "-c","npm run dev " ]

docker/Dockerfile_base

+# 环境
+FROM node:19.6.1-alpine3.17 AS build-env
+USER root
+
+ENV SRC_HOME=/root/src
+RUN mkdir -p $SRC_HOME
+
+# 复制源代码
+ADD . $SRC_HOME/
+
+
+WORKDIR $SRC_HOME/vs_socket_backend
+RUN yarn
\ No newline at end of file

docker/docker-compose-dev.yaml

+version: '2.2'
+services:
+  tasks_backend:
+    image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
+    container_name: tasks_backend
+    restart: always
+    ports:
+      - "7001:7001"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /docker-data/vs-socketio-uploads:/root/src/vs_socket_backend/app/public/uploads
\ No newline at end of file

docker/docker-compose-prod.yaml

+version: '2.2'
+services:
+  tasks_backend:
+    image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
+    container_name: tasks_backend
+    restart: always
+    ports:
+      - "7001:7001"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /docker-data/vs-socketio-uploads:/root/src/vs_socket_backend/app/public/uploads

docker/docker-compose-test.yaml

+version: '2.2'
+services:
+  tasks_backend:
+    image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
+    container_name: tasks_backend
+    restart: always
+    ports:
+      - "7001:7001"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /docker-data/vs-socketio-uploads:/root/src/vs_socket_backend/app/public/uploads
\ No newline at end of file