!53 fix dangling unpigz
From: @wangfengtu Reviewed-by: @jianminw Signed-off-by: @jianminw
This commit is contained in:
commit
29ef3fd19c
@ -1,6 +1,6 @@
|
||||
Name: docker-engine
|
||||
Version: 18.09.0
|
||||
Release: 115
|
||||
Release: 116
|
||||
Summary: The open-source application container engine
|
||||
Group: Tools/Docker
|
||||
|
||||
@ -211,6 +211,12 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 30 2021 wangfengtu<wangfengtu@huawei.com> - 18.09.0-116
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:fix dangling unpigz
|
||||
|
||||
* Thu Apr 01 2021 wangfengtu<wangfengtu@huawei.com> - 18.09.0-115
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
25
patch/0192-fix-dangling-unpigz.patch
Normal file
25
patch/0192-fix-dangling-unpigz.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 6926d4e842dc26043cbdd38de5a8c0776f0d4d43 Mon Sep 17 00:00:00 2001
|
||||
From: WangFengTu <wangfengtu@huawei.com>
|
||||
Date: Sun, 29 Aug 2021 15:49:03 +0800
|
||||
Subject: [PATCH] fix dangling unpigz
|
||||
|
||||
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
|
||||
---
|
||||
components/engine/builder/dockerfile/copy.go | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/components/engine/builder/dockerfile/copy.go b/components/engine/builder/dockerfile/copy.go
|
||||
index ad9b08df..c323e703 100644
|
||||
--- a/components/engine/builder/dockerfile/copy.go
|
||||
+++ b/components/engine/builder/dockerfile/copy.go
|
||||
@@ -527,6 +527,7 @@ func isArchivePath(driver containerfs.ContainerFS, path string) bool {
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
+ defer rdr.Close()
|
||||
r := tar.NewReader(rdr)
|
||||
_, err = r.Next()
|
||||
return err == nil
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -189,4 +189,5 @@ patch/0188-docker-check-containerd-pid-before-kill-it.patch
|
||||
patch/0189-docker-fix-Access-to-remapped-root-allows-privilege-.patch
|
||||
patch/0190-docker-fix-CVE-2021-21285.patch
|
||||
patch/0191-rollback-if-docker-restart-when-doing-BlkDiscard.patch
|
||||
patch/0192-fix-dangling-unpigz.patch
|
||||
#end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user