!159 update from openeuler
From: @gaohuatao Reviewed-by: @jingwoo,@duguhaotian Signed-off-by: @duguhaotian
This commit is contained in:
commit
08ba01fe7b
@ -1,27 +0,0 @@
|
|||||||
From 4ccd38e9e17534467eb1add9ee9ed357f2eb9dbd Mon Sep 17 00:00:00 2001
|
|
||||||
From: WangFengTu <wangfengtu@huawei.com>
|
|
||||||
Date: Tue, 19 Oct 2021 11:14:32 +0800
|
|
||||||
Subject: [PATCH] strip sha256 prefix when decrease hold references
|
|
||||||
|
|
||||||
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
|
|
||||||
---
|
|
||||||
src/daemon/modules/image/oci/registry/registry.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/daemon/modules/image/oci/registry/registry.c b/src/daemon/modules/image/oci/registry/registry.c
|
|
||||||
index cc5f680..011533f 100644
|
|
||||||
--- a/src/daemon/modules/image/oci/registry/registry.c
|
|
||||||
+++ b/src/daemon/modules/image/oci/registry/registry.c
|
|
||||||
@@ -1548,7 +1548,8 @@ static int fetch_all(pull_descriptor *desc)
|
|
||||||
}
|
|
||||||
free(desc->layer_of_hold_refs);
|
|
||||||
desc->layer_of_hold_refs = util_strdup_s(list->layers[j]->id);
|
|
||||||
- if (parent_chain_id != NULL && storage_dec_hold_refs(parent_chain_id) != 0) {
|
|
||||||
+ if (parent_chain_id != NULL &&
|
|
||||||
+ storage_dec_hold_refs(util_without_sha256_prefix(parent_chain_id)) != 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
desc->layers[i].already_exist = true;
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
11
iSulad.spec
11
iSulad.spec
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.9
|
%global _version 2.0.10
|
||||||
%global _release 20211019.121837.gitf067b3ce
|
%global _release 1
|
||||||
%global is_systemd 1
|
%global is_systemd 1
|
||||||
|
|
||||||
Name: iSulad
|
Name: iSulad
|
||||||
@ -12,7 +12,6 @@ Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar
|
|||||||
BuildRoot: {_tmppath}/iSulad-%{version}
|
BuildRoot: {_tmppath}/iSulad-%{version}
|
||||||
ExclusiveArch: x86_64 aarch64
|
ExclusiveArch: x86_64 aarch64
|
||||||
|
|
||||||
Patch0001: 0001-strip-sha256-prefix-when-decrease-hold-references.patch
|
|
||||||
|
|
||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64
|
||||||
Provides: libhttpclient.so()(64bit)
|
Provides: libhttpclient.so()(64bit)
|
||||||
@ -216,6 +215,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 09 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.10-1
|
||||||
|
- Type: bugfix
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: update from openeuler
|
||||||
|
|
||||||
* Tue Oct 19 2021 wangfengtu <wangfengtu@huawei.com> - 2.0.9-20211019.121837.gitf067b3ce
|
* Tue Oct 19 2021 wangfengtu <wangfengtu@huawei.com> - 2.0.9-20211019.121837.gitf067b3ce
|
||||||
- Type: bugfix
|
- Type: bugfix
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user