Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SocketIo_Middleware
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wuhao
SocketIo_Middleware
Commits
2414ad50
Commit
2414ad50
authored
May 29, 2023
by
maojiafeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改socketio的配置
parent
eb8d84ec
Pipeline
#3509
failed with stages
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
17 deletions
+31
-17
.gitlab-ci.yml
.gitlab-ci.yml
+16
-2
Dockerfile_backend_dev
docker/Dockerfile_backend_dev
+1
-1
Dockerfile_backend_prod
docker/Dockerfile_backend_prod
+1
-1
Dockerfile_backend_test
docker/Dockerfile_backend_test
+1
-1
docker-compose-dev.yaml
docker/docker-compose-dev.yaml
+4
-4
docker-compose-prod.yaml
docker/docker-compose-prod.yaml
+4
-4
docker-compose-test.yaml
docker/docker-compose-test.yaml
+4
-4
No files found.
.gitlab-ci.yml
View file @
2414ad50
...
@@ -31,6 +31,20 @@ vs-socketio-backend-dev:
...
@@ -31,6 +31,20 @@ vs-socketio-backend-dev:
changes
:
changes
:
-
utools_backend/**/*
-
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
:
vs-socketio-backend-prod
:
image
:
$NANGAO_BASE_IMAGE
image
:
$NANGAO_BASE_IMAGE
...
@@ -59,7 +73,7 @@ deploy_test:
...
@@ -59,7 +73,7 @@ deploy_test:
-
ssh-add <(echo "$PRIVATE_KEY")
-
ssh-add <(echo "$PRIVATE_KEY")
script
:
script
:
-
rsync -Phvz -e "ssh -p 6001" ./docker-compose-dev.yaml root@$DEV_IP:/root/docker-compose/vs_socketio_backend/docker-compose.yaml
-
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_socket
io
_backend; docker-compose pull vs_socketio_backend;docker-compose up -d --build vs_socketio_backend;docker-compose up -d '
#发布到正式环境
#发布到正式环境
deploy_prod
:
deploy_prod
:
...
@@ -73,6 +87,6 @@ deploy_prod:
...
@@ -73,6 +87,6 @@ deploy_prod:
-
echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-
echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-
ssh-add <(echo "$PRIVATE_KEY")
-
ssh-add <(echo "$PRIVATE_KEY")
script
:
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_socket
io
_backend/docker-compose.yaml
-
ssh $PROD_IP 'cd /root/docker-compose/vs_socketio_backend; docker-compose pull vs_socketio_backend; docker-compose up -d '
-
ssh $PROD_IP 'cd /root/docker-compose/vs_socketio_backend; docker-compose pull vs_socketio_backend; docker-compose up -d '
when
:
manual
when
:
manual
docker/Dockerfile_backend_dev
View file @
2414ad50
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
# 复制源代码
ADD . $SRC_HOME/
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socket
io
_backend
RUN yarn
RUN yarn
...
...
docker/Dockerfile_backend_prod
View file @
2414ad50
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
# 复制源代码
ADD . $SRC_HOME/
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socket
io
_backend
RUN yarn
RUN yarn
...
...
docker/Dockerfile_backend_test
View file @
2414ad50
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
...
@@ -8,7 +8,7 @@ RUN mkdir -p $SRC_HOME
# 复制源代码
# 复制源代码
ADD . $SRC_HOME/
ADD . $SRC_HOME/
WORKDIR $SRC_HOME/vs_socket_backend
WORKDIR $SRC_HOME/vs_socket
io
_backend
RUN yarn
RUN yarn
...
...
docker/docker-compose-dev.yaml
View file @
2414ad50
version
:
'
2.2'
version
:
'
2.2'
services
:
services
:
vs_socket_backend
:
vs_socket
io
_backend
:
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket
io
_backend
container_name
:
vs_socket_backend
container_name
:
vs_socket
io
_backend
restart
:
always
restart
:
always
ports
:
ports
:
-
"
7001:7001"
-
"
7001:7001"
volumes
:
volumes
:
-
/etc/localtime:/etc/localtime:ro
-
/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
\ No newline at end of file
\ No newline at end of file
docker/docker-compose-prod.yaml
View file @
2414ad50
version
:
'
2.2'
version
:
'
2.2'
services
:
services
:
vs_socket_backend
:
vs_socket
io
_backend
:
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket
io
_backend
container_name
:
vs_socket_backend
container_name
:
vs_socket
io
_backend
restart
:
always
restart
:
always
ports
:
ports
:
-
"
7001:7001"
-
"
7001:7001"
volumes
:
volumes
:
-
/etc/localtime:/etc/localtime:ro
-
/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_socket
io
_backend/app/public/uploads
docker/docker-compose-test.yaml
View file @
2414ad50
version
:
'
2.2'
version
:
'
2.2'
services
:
services
:
vs_socket_backend
:
vs_socket
io
_backend
:
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket_backend
image
:
swr.cn-north-4.myhuaweicloud.com/nangao-iot/vs_socket
io
_backend
container_name
:
vs_socket_backend
container_name
:
vs_socket
io
_backend
restart
:
always
restart
:
always
ports
:
ports
:
-
"
7001:7001"
-
"
7001:7001"
volumes
:
volumes
:
-
/etc/localtime:/etc/localtime:ro
-
/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
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment