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
fedf74c7
Commit
fedf74c7
authored
Apr 08, 2020
by
金凯强
🎨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复对象获取失败错误
parent
d7aed31f
Pipeline
#22303
failed with stage
in 11 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
upgrade_service.py
app/upgrade/upgrade_service.py
+2
-4
No files found.
app/upgrade/upgrade_service.py
View file @
fedf74c7
...
...
@@ -524,7 +524,8 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
_image_info
[
'code'
]
=
code
deploy_image_list
.
append
(
_image_info
)
# 本地镜像获取
local_image_info
=
os
.
popen
(
'docker images --format "table {{.ID}}
\t
{{.Repository}}
\t
{{.Tag}}"'
)
with
os
.
popen
(
'docker images --format "table {{.ID}}
\t
{{.Repository}}
\t
{{.Tag}}"'
)
as
f
:
local_image_info
=
f
.
read
()
local_app_list
=
self
.
convert_image_info_str_to_list
(
local_image_info
)
# 根据镜像名和版本号过滤本地镜像
filter_app_list
=
[]
...
...
@@ -611,9 +612,6 @@ docker-compose -f /data/upgrade_tools_data/backup/{upgrade_no}/docker-compose.ym
:param image_info_str:
:return:
'''
logger
.
info
(
image_info_str
)
logger
.
info
(
type
(
image_info_str
))
logger
.
info
(
'-------------'
)
image_info_str
=
image_info_str
.
replace
(
'
\r
'
,
''
)
server_image_str_list
=
image_info_str
.
split
(
'
\n
'
)[
1
:]
image_info_list
=
[]
...
...
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