Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
7b98b219
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b98b219
编写于
5月 09, 2020
作者:
W
WangFengTu
提交者:
lifeng68
7月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ignore case when compare manifest's platform
Signed-off-by:
N
WangFengTu
<
wangfengtu@huawei.com
>
上级
8915c87f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
8 deletion
+13
-8
src/image/oci/oci_pull.c
src/image/oci/oci_pull.c
+8
-3
src/image/oci/registry/registry_apiv2.c
src/image/oci/registry/registry_apiv2.c
+5
-5
未找到文件。
src/image/oci/oci_pull.c
浏览文件 @
7b98b219
...
...
@@ -86,7 +86,7 @@ static void update_option_skip_tls_verify(registry_pull_options *options, char *
}
}
static
int
pull_image
(
const
im_pull_request
*
request
)
static
int
pull_image
(
const
im_pull_request
*
request
,
char
**
name
)
{
int
ret
=
-
1
;
registry_pull_options
*
options
=
NULL
;
...
...
@@ -145,6 +145,8 @@ static int pull_image(const im_pull_request *request)
}
}
*
name
=
util_strdup_s
(
options
->
dest_image_name
);
out:
free
(
host
);
host
=
NULL
;
...
...
@@ -162,19 +164,20 @@ int oci_do_pull_image(const im_pull_request *request, im_pull_response **respons
{
int
ret
=
0
;
imagetool_image
*
image
=
NULL
;
char
*
dest_image_name
=
NULL
;
if
(
request
==
NULL
||
request
->
image
==
NULL
||
response
==
NULL
)
{
ERROR
(
"Invalid NULL param"
);
return
-
1
;
}
ret
=
pull_image
(
request
);
ret
=
pull_image
(
request
,
&
dest_image_name
);
if
(
ret
!=
0
)
{
ERROR
(
"pull image %s failed"
,
request
->
image
);
goto
err_out
;
}
image
=
storage_img_get
(
request
->
imag
e
);
image
=
storage_img_get
(
dest_image_nam
e
);
if
(
image
==
NULL
)
{
ERROR
(
"get image %s failed after pulling"
,
request
->
image
);
goto
err_out
;
...
...
@@ -195,5 +198,7 @@ err_out:
out:
free_imagetool_image
(
image
);
image
=
NULL
;
free
(
dest_image_name
);
dest_image_name
=
NULL
;
return
ret
;
}
src/image/oci/registry/registry_apiv2.c
浏览文件 @
7b98b219
...
...
@@ -789,7 +789,7 @@ static bool is_variant_same(char *variant1, char *variant2)
if
(
variant1
==
NULL
||
variant2
==
NULL
)
{
return
false
;
}
return
!
strcmp
(
variant1
,
variant2
);
return
!
strc
asec
mp
(
variant1
,
variant2
);
}
static
int
select_oci_manifest
(
oci_image_index
*
index
,
char
**
content_type
,
char
**
digest
)
...
...
@@ -818,7 +818,7 @@ static int select_oci_manifest(oci_image_index *index, char **content_type, char
if
(
platform
==
NULL
||
platform
->
architecture
==
NULL
||
platform
->
os
==
NULL
)
{
continue
;
}
if
(
!
strc
mp
(
platform
->
architecture
,
host_arch
)
&&
!
str
cmp
(
platform
->
os
,
host_os
)
&&
if
(
!
strc
asecmp
(
platform
->
architecture
,
host_arch
)
&&
!
strcase
cmp
(
platform
->
os
,
host_os
)
&&
is_variant_same
(
host_variant
,
platform
->
variant
))
{
free
(
*
content_type
);
*
content_type
=
util_strdup_s
(
index
->
manifests
[
i
]
->
media_type
);
...
...
@@ -835,7 +835,7 @@ static int select_oci_manifest(oci_image_index *index, char **content_type, char
if
(
platform
==
NULL
||
platform
->
architecture
==
NULL
||
platform
->
os
==
NULL
)
{
continue
;
}
if
(
!
strc
mp
(
platform
->
architecture
,
host_arch
)
&&
!
str
cmp
(
platform
->
os
,
host_os
))
{
if
(
!
strc
asecmp
(
platform
->
architecture
,
host_arch
)
&&
!
strcase
cmp
(
platform
->
os
,
host_os
))
{
free
(
*
content_type
);
*
content_type
=
util_strdup_s
(
index
->
manifests
[
i
]
->
media_type
);
free
(
*
digest
);
...
...
@@ -890,7 +890,7 @@ static int select_docker_manifest(registry_manifest_list *manifests, char **cont
if
(
platform
==
NULL
||
platform
->
architecture
==
NULL
||
platform
->
os
==
NULL
)
{
continue
;
}
if
(
!
strc
mp
(
platform
->
architecture
,
host_arch
)
&&
!
str
cmp
(
platform
->
os
,
host_os
)
&&
if
(
!
strc
asecmp
(
platform
->
architecture
,
host_arch
)
&&
!
strcase
cmp
(
platform
->
os
,
host_os
)
&&
is_variant_same
(
host_variant
,
platform
->
variant
))
{
free
(
*
content_type
);
*
content_type
=
util_strdup_s
(
manifests
->
manifests
[
i
]
->
media_type
);
...
...
@@ -907,7 +907,7 @@ static int select_docker_manifest(registry_manifest_list *manifests, char **cont
if
(
platform
==
NULL
||
platform
->
architecture
==
NULL
||
platform
->
os
==
NULL
)
{
continue
;
}
if
(
!
strc
mp
(
platform
->
architecture
,
host_arch
)
&&
!
str
cmp
(
platform
->
os
,
host_os
))
{
if
(
!
strc
asecmp
(
platform
->
architecture
,
host_arch
)
&&
!
strcase
cmp
(
platform
->
os
,
host_os
))
{
free
(
*
content_type
);
*
content_type
=
util_strdup_s
(
manifests
->
manifests
[
i
]
->
media_type
);
free
(
*
digest
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录