Commit 2414ad50 authored by maojiafeng's avatar maojiafeng

修改socketio的配置

parent eb8d84ec
Pipeline #3509 failed with stages
......@@ -31,6 +31,20 @@ vs-socketio-backend-dev:
changes:
- utools_backend/**/*
vs-socketio-backend-test:
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_test -t "$VS_SOCKETIO_IMAGE"-test .
- docker push "$VS_SOCKETIO_IMAGE"-test
only:
changes:
- utools_backend/**/*
vs-socketio-backend-prod:
image: $NANGAO_BASE_IMAGE
......@@ -59,7 +73,7 @@ deploy_test:
- 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 '
- ssh -p 6001 $DEV_IP 'cd /root/docker-compose/vs_socketio_backend; docker-compose pull vs_socketio_backend;docker-compose up -d --build vs_socketio_backend;docker-compose up -d '
#发布到正式环境
deploy_prod:
......@@ -73,6 +87,6 @@ deploy_prod:
- 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
- rsync -Phvz -e "ssh" ./docker-compose-prod.yaml root@$PROD_IP:/root/docker-compose/vs_socketio_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
......@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socketio_backend
RUN yarn
......
......@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socketio_backend
RUN yarn
......
......@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socketio_backend
RUN yarn
......
version: '2.2'
services:
vs_socket_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
container_name: vs_socket_backend
vs_socketio_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socketio_backend
container_name: vs_socketio_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-data/vs-socketio-uploads:/root/src/vs_socketio_backend/app/public/uploads
\ No newline at end of file
version: '2.2'
services:
vs_socket_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
container_name: vs_socket_backend
vs_socketio_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socketio_backend
container_name: vs_socketio_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-data/vs-socketio-uploads:/root/src/vs_socketio_backend/app/public/uploads
version: '2.2'
services:
vs_socket_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
container_name: vs_socket_backend
vs_socketio_backend:
image: swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socketio_backend
container_name: vs_socketio_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-data/vs-socketio-uploads:/root/src/vs_socketio_backend/app/public/uploads
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment