Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
I
install.api
Project
Project
Details
Activity
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
Script
install.api
Commits
f2c0f6a4
Commit
f2c0f6a4
authored
Apr 17, 2020
by
金凯强
🎨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改应用修改的报错信息
parent
20e5f79a
Pipeline
#22680
failed
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
.gitlab-ci.yml
.gitlab-ci.yml
+5
-7
upgrade_service.py
app/upgrade/upgrade_service.py
+1
-1
No files found.
.gitlab-ci.yml
View file @
f2c0f6a4
...
...
@@ -18,10 +18,9 @@ build:
tags
:
-
dev
script
:
-
python /sync_release_info_to_db.py
-
docker build -t ${APP_IMAGE}:${CI_COMMIT_REF_NAME} .
except
:
-
master
only
:
-
1.0
push
:
stage
:
push
...
...
@@ -29,8 +28,7 @@ push:
tags
:
-
dev
script
:
-
docker build -t ${APP_IMAGE}:${APP_VERSION} .
-
docker push ${APP_IMAGE}:${APP_VERSION}
-
docker push ${APP_IMAGE}:${CI_COMMIT_REF_NAME}
-
echo "success"
only
:
-
web
\ No newline at end of file
-
1.0
\ No newline at end of file
app/upgrade/upgrade_service.py
View file @
f2c0f6a4
...
...
@@ -540,7 +540,7 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
out
,
err
=
ssh
.
exec_command
(
f
'''export HUANSI_REGISTRY_URL=47.110.145.204:8084 &&
\
source /etc/profile.d/huansi.sh &&
\
docke
docker
-f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.yml -p deploy restart -t 100'''
)
docke
r-compose
-f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.yml -p deploy restart -t 100'''
)
logger
.
info
(
f
'应用操作信息:{out},err:{err}'
)
logger
.
info
(
"应用修改成功"
)
\ 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