Skip to content

I
iSulad-img

openeuler / iSulad-img

通知 1
Star 0
Fork 0
I
iSulad-img

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 8c7b46d1 编写于 作者: O openeuler-ci-bot 提交者： Gitee
浏览文件
操作

!19 Do not use authorization file of other container engine 

Merge pull request !19 from Grooooot/auth_file
上级 ce8f318e 488a4bf7
隐藏空白更改
内联 并排
Showing with 181 addition and 92 deletion
patch/0001-add-image-load-time-and-append-image-names.patch
浏览文件 @ 8c7b46d1
From 90133e535aba3230091c998a31cb1873cb6e0d8f Mon Sep 17 00:00:00 2001
From c98ebb2448868b0574c335a1df429837b8b4e9e3 Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Tue, 2 Apr 2019 23:37:17 -0400
Subject: [PATCH 01/46] add image load time and append image names
Subject: [PATCH 01/47] add image load time and append image names
reason: 1. add image load time
2. append image names when pull image
......
patch/0002-add-image-integration-check.patch
浏览文件 @ 8c7b46d1
From 2fbf4bb9ec8ca93c1073127391f109a4417cabda Mon Sep 17 00:00:00 2001
From dd185d6ff7b5667a3cb35d83ab001e2e3783be50 Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Thu, 4 Apr 2019 11:03:15 -0400
Subject: [PATCH 02/46] add image integration check
Subject: [PATCH 02/47] add image integration check
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0003-vendor-support-setting-rootfs-quota.patch
浏览文件 @ 8c7b46d1
From daa65a17fda9ac6bd40d58be991d4b2956397d5b Mon Sep 17 00:00:00 2001
From c5e872c36403e173ee96f288beaa00e86fe057ea Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Tue, 9 Apr 2019 01:32:27 -0400
Subject: [PATCH 03/46] vendor: support setting rootfs quota
Subject: [PATCH 03/47] vendor: support setting rootfs quota
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0004-isulad-kit-vendor-check-overlay-support-as-docker.patch
浏览文件 @ 8c7b46d1
From 835938d4b536e3ac448c9629432f5542cd7f9677 Mon Sep 17 00:00:00 2001
From 9468671bd0b10c4b050da9626620393b18968977 Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Tue, 9 Apr 2019 12:19:49 -0400
Subject: [PATCH 04/46] isulad-kit-vendor: check overlay support as docker
Subject: [PATCH 04/47] isulad-kit-vendor: check overlay support as docker
we may got failed if always detect multi lower layer mount,
when writed data more than rootfs quota for arm machine
......
patch/0005-isulad-kit-vendor-fix-parseSize-of-float-accurancy.patch
浏览文件 @ 8c7b46d1
From 823bc6efd3b724558262fe62dbc6adcadfbb4f55 Mon Sep 17 00:00:00 2001
From 51fc518c6c14bda57df75647632f90a4b4d2951b Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Tue, 16 Apr 2019 00:44:20 -0400
Subject: [PATCH 05/46] isulad-kit-vendor: fix parseSize of float accurancy
Subject: [PATCH 05/47] isulad-kit-vendor: fix parseSize of float accurancy
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0006-limit-the-minimum-size-of-rootfs-quota-to-4k.patch
浏览文件 @ 8c7b46d1
From 142be14948ee2f892077faefa9f03a484f7e5e28 Mon Sep 17 00:00:00 2001
From bca8f7eaa4cb20c1fd0d3898ef75fa97fc639b8c Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Tue, 16 Apr 2019 10:53:52 -0400
Subject: [PATCH 06/46] limit the minimum size of rootfs quota to 4k
Subject: [PATCH 06/47] limit the minimum size of rootfs quota to 4k
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0007-delete-try-to-delete-metadata-before-image-data.patch
浏览文件 @ 8c7b46d1
From 16e4eb29be60a841be68bc652d0e7c30fbeccc4e Mon Sep 17 00:00:00 2001
From 45dd5de26f33c652e6aa530ff832b84df86cecad Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Thu, 18 Apr 2019 05:04:18 -0400
Subject: [PATCH 07/46] delete: try to delete metadata before image data
Subject: [PATCH 07/47] delete: try to delete metadata before image data
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0008-same-add-group-should-skip.patch
浏览文件 @ 8c7b46d1
From 72bbe29714119d8950b3c67a9d6267ace6835869 Mon Sep 17 00:00:00 2001
From cab91bcaeadfedcf279016ece03ea85e101c158d Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Fri, 19 Apr 2019 17:15:29 +0800
Subject: [PATCH 08/46] same add group should skip
Subject: [PATCH 08/47] same add group should skip
same add group should skip
......
patch/0009-optimize-concurrent-run.patch
浏览文件 @ 8c7b46d1
From fc70e3d4f9b01c25a46d68907f5c3cc51edee3b3 Mon Sep 17 00:00:00 2001
From 2e65f958c0ad4f3a1712b46e0050ce5719289bc9 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Thu, 25 Apr 2019 18:00:18 +0800
Subject: [PATCH 09/46] optimize concurrent run
Subject: [PATCH 09/47] optimize concurrent run
Signed-off-by: LiuHao <liuhao27@huawei.com>
---
......
patch/0010-abnormal-scene-container-restart-failure.patch
浏览文件 @ 8c7b46d1
From 487335eb32acda31634a01ac7450db079c2d823e Mon Sep 17 00:00:00 2001
From fd2ecc289e1f462e3b25aaf7b2e1dee709d201ab Mon Sep 17 00:00:00 2001
From: WuJing <wujing50@huawei.com>
Date: Mon, 29 Apr 2019 16:46:09 +0800
Subject: [PATCH 10/46] abnormal scene container restart failure
Subject: [PATCH 10/47] abnormal scene container restart failure
Solve the problem that the mountpoint.json write
fails due to an abnormal condition, causing the container to fail to
......
patch/0011-optimize-isulad_kit-operator.patch
浏览文件 @ 8c7b46d1
From c890c03f1bd32df21e0e75c8b97640831f2527e0 Mon Sep 17 00:00:00 2001
From dc0c058020a7abd3ca1f8a0a41a7811959feb2d5 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Thu, 2 May 2019 11:25:07 +0800
Subject: [PATCH 11/46] optimize isulad_kit operator
Subject: [PATCH 11/47] optimize isulad_kit operator
get mountpoint from driver
......
patch/0012-fix-compile-error.patch
浏览文件 @ 8c7b46d1
From 6ba90504cd69e51a786d639254cdb773d774570f Mon Sep 17 00:00:00 2001
From 00c7d9d8407807e4058af30a012a4c83c53f6b0f Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Thu, 2 May 2019 11:56:34 +0800
Subject: [PATCH 12/46] fix compile error
Subject: [PATCH 12/47] fix compile error
fix compile error
......
patch/0013-rmi-try-to-remove-all-layers-info-when-rmi.patch
浏览文件 @ 8c7b46d1
From 6c4dfcf9153eca15655a87fe2067bb79e5f34204 Mon Sep 17 00:00:00 2001
From b19104761cfa2d5398faaa5c86c2f19ae2ff8af2 Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Tue, 7 May 2019 03:40:58 -0400
Subject: [PATCH 13/46] rmi: try to remove all layers info when rmi
Subject: [PATCH 13/47] rmi: try to remove all layers info when rmi
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0014-isulad-kit-vendor-ensure-remove-container-rootfs-dir.patch
浏览文件 @ 8c7b46d1
From 11844cb70ab93e263b9c8b8b8d400bb9d881e08d Mon Sep 17 00:00:00 2001
From 1315f982005a00028c012b356b65cfb7621faf03 Mon Sep 17 00:00:00 2001
From: WuJing <wujing50@huawei.com>
Date: Mon, 13 May 2019 09:31:43 +0800
Subject: [PATCH 14/46] isulad-kit-vendor: ensure remove container rootfs dir
Subject: [PATCH 14/47] isulad-kit-vendor: ensure remove container rootfs dir
when errmsg contain "File name too long"
Signed-off-by: WuJing <wujing50@huawei.com>
......
patch/0015-split-mountpoints.json-and-layers.json-in-save.patch
浏览文件 @ 8c7b46d1
From e4513cacdaca5e57d75ccba08f951faec4658db9 Mon Sep 17 00:00:00 2001
From 24bf6c1be459be7633ed038835ca2d3cafcef13d Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Mon, 13 May 2019 04:58:15 -0400
Subject: [PATCH 15/46] split mountpoints.json and layers.json in save
Subject: [PATCH 15/47] split mountpoints.json and layers.json in save
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0016-isulad-kit-vendor-fix-bug-of-concurrent-run-with-quo.patch
浏览文件 @ 8c7b46d1
From b3e4ebe1ae5f22d0a0ae07d6b2f3459ad53868c4 Mon Sep 17 00:00:00 2001
From 1ab794c489aebb4060b4eb61b169fe93d494da23 Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Mon, 20 May 2019 10:05:08 -0400
Subject: [PATCH 16/46] isulad-kit-vendor: fix bug of concurrent run with quota
Subject: [PATCH 16/47] isulad-kit-vendor: fix bug of concurrent run with quota
reason: setProjectQuota using common mutex to avoid set the same
project id for diffrent containers, this may also get the same
......
patch/0017-isulad-kit-vendor-fix-compile-error.patch
浏览文件 @ 8c7b46d1
From f0b94f08133156058ce0e75354ac63efe0676e5f Mon Sep 17 00:00:00 2001
From d8bfa737c38d7509e8dbc538ad3d1e6390501b8e Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Mon, 20 May 2019 10:31:12 -0400
Subject: [PATCH 17/46] isulad-kit-vendor: fix compile error
Subject: [PATCH 17/47] isulad-kit-vendor: fix compile error
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0018-remove-unused-code.patch
浏览文件 @ 8c7b46d1
From bcc282a8741c266209c2cc40d442c1442e495caf Mon Sep 17 00:00:00 2001
From 043124e377fb4813f49ef81fd09c5f3bef118e4b Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Mon, 20 May 2019 10:45:55 -0400
Subject: [PATCH 18/46] remove unused code
Subject: [PATCH 18/47] remove unused code
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0019-optimize-mount-operator.patch
浏览文件 @ 8c7b46d1
From 849a38a20e81db956a775857ddaf041607dc7efa Mon Sep 17 00:00:00 2001
From 4951caae5d47379dcf4d7171501d4b0b9adda6c6 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Sat, 25 May 2019 16:45:28 +0800
Subject: [PATCH 19/46] optimize mount operator
Subject: [PATCH 19/47] optimize mount operator
1. split mountpoints.json to each container
2. refactor mount operator
......
patch/0020-Fix-file-retention-bug.patch
浏览文件 @ 8c7b46d1
From 02d1d93d12f09e3fce29bd919ff4f74a5938a8d9 Mon Sep 17 00:00:00 2001
From 1824ef18be79c6699c1f93322f87047a78a0d67c Mon Sep 17 00:00:00 2001
From: WuJing <wujing50@huawei.com>
Date: Mon, 10 Jun 2019 10:54:43 +0800
Subject: [PATCH 20/46] Fix file retention bug
Subject: [PATCH 20/47] Fix file retention bug
Signed-off-by: WuJing <wujing50@huawei.com>
---
......
patch/0021-set-layer-MountCount-0-without-mount-point-file.patch
浏览文件 @ 8c7b46d1
From 74ea70c59fbf02c5b5d0e818c06df5da59939c38 Mon Sep 17 00:00:00 2001
From 832721f375c328634f89d288bfbd137b19ff6c1c Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Mon, 10 Jun 2019 09:41:44 -0400
Subject: [PATCH 21/46] set layer MountCount = 0 without mount point file
Subject: [PATCH 21/47] set layer MountCount = 0 without mount point file
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0022-encrypt-auth-config-and-add-lock.patch
浏览文件 @ 8c7b46d1
From c5e4bfdad2a0d7d66bb11275dddbdcdc229c5490 Mon Sep 17 00:00:00 2001
From d88ace15f218b2c804f6abdaa1b9f4bd8d54136d Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 18 Jun 2019 14:12:33 +0800
Subject: [PATCH 22/46] encrypt auth config and add lock
Subject: [PATCH 22/47] encrypt auth config and add lock
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0023-Change-perm-and-add-max-file-size-check.patch
浏览文件 @ 8c7b46d1
From 0c070aaad0d7d549ba36c26dbb98f2746d2d7979 Mon Sep 17 00:00:00 2001
From 2ef169048f71da10cc93ac5f0188fc8f7e721298 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Thu, 4 Jul 2019 16:19:56 +0800
Subject: [PATCH 23/46] Change perm and add max file size check
Subject: [PATCH 23/47] Change perm and add max file size check
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0024-force-remove-dir-with-rm-rf-in-overlay.patch
浏览文件 @ 8c7b46d1
From 732360998205ab672e23c85bc9cfc22fc75133c4 Mon Sep 17 00:00:00 2001
From 93d7d63a6cc10ecbfb2d4a04161f244107ec3165 Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Thu, 18 Jul 2019 06:20:49 -0400
Subject: [PATCH 24/46] force remove dir with rm -rf in overlay
Subject: [PATCH 24/47] force remove dir with rm -rf in overlay
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0025-EnsureRemoveAll-make-retry-count-from-5-to-50.patch
浏览文件 @ 8c7b46d1
From 3e5f0d06a61566ba6d5ae7e4d0b3223aee772972 Mon Sep 17 00:00:00 2001
From 09ea04f065fb0de0dd545384b6b5593bae0b3c00 Mon Sep 17 00:00:00 2001
From: LiFeng <lifeng68@huawei.com>
Date: Mon, 22 Jul 2019 03:52:09 -0400
Subject: [PATCH 25/46] EnsureRemoveAll make retry count from 5 to 50
Subject: [PATCH 25/47] EnsureRemoveAll make retry count from 5 to 50
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
......
patch/0026-report-error-log-when-openDir-failed.patch
浏览文件 @ 8c7b46d1
From 75bf974aa41d60abd43b9ece6ce8b6feb3457d7c Mon Sep 17 00:00:00 2001
From 210332062889c19d65696b4ec45d701c7b163537 Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Fri, 26 Jul 2019 05:02:55 -0400
Subject: [PATCH 26/46] report error log when openDir failed
Subject: [PATCH 26/47] report error log when openDir failed
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
---
......
patch/0027-ignore-ENOENT-if-direcotry-has-been-removed-when-fin.patch
浏览文件 @ 8c7b46d1
From 405e83ab82f6d4031e23e587e224ae7c63e5be2d Mon Sep 17 00:00:00 2001
From 7b4d868a4b328edf6a7cd24b55934fd9e968eb11 Mon Sep 17 00:00:00 2001
From: TanYiFeng <tanyifeng1@huawei.com>
Date: Fri, 9 Aug 2019 04:56:23 -0400
Subject: [PATCH 27/46] ignore ENOENT if direcotry has been removed when find
Subject: [PATCH 27/47] ignore ENOENT if direcotry has been removed when find
next project id
Signed-off-by: TanYiFeng <tanyifeng1@huawei.com>
......
patch/0028-fixbug-cause-by-remove-container.json-in-run-dir.patch
浏览文件 @ 8c7b46d1
From b51ce6011c5756013841f8a46faeaedb92b6437d Mon Sep 17 00:00:00 2001
From 1eb7d2ff9ce00ed32e43755b49400c41f824da1e Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Fri, 9 Aug 2019 17:07:33 +0800
Subject: [PATCH 28/46] fixbug: cause by remove container.json in run dir
Subject: [PATCH 28/47] fixbug: cause by remove container.json in run dir
Start container will load container.json in run dir.
If it is not exist, start container will failed.
......
patch/0029-Performace-optimization.patch
浏览文件 @ 8c7b46d1
From 93ff197677573721d8f263ec61b391eec255b6e9 Mon Sep 17 00:00:00 2001
From ac322bf9dd6d593ca76c12dddc7aa013cfb239b7 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 26 Nov 2019 22:06:55 -0500
Subject: [PATCH 29/46] Performace optimization
Subject: [PATCH 29/47] Performace optimization
1.Seprate big json file to small json files.
2.Migation json files for above change.
......
patch/0030-Support-load-multiple-images.patch
浏览文件 @ 8c7b46d1
From f921c0eaf7e30c826c6d5f353def72a5bd720127 Mon Sep 17 00:00:00 2001
From 179a59c3175d77ecd7c9fcf7b9c61482e3cfd95b Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Mon, 18 Nov 2019 21:20:52 -0500
Subject: [PATCH 30/46] Support load multiple images
Subject: [PATCH 30/47] Support load multiple images
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0031-SWR-response-406-Not-Acceptable-if-oci-image-in-firs.patch
浏览文件 @ 8c7b46d1
From 57393a0ee0b7fe675560660663574d520957ef6d Mon Sep 17 00:00:00 2001
From 83463e494351f582edc31b8ca0d6244b1153d93b Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Fri, 29 Nov 2019 03:21:02 -0500
Subject: [PATCH 31/46] SWR response "406: Not Acceptable" if oci image in
Subject: [PATCH 31/47] SWR response "406: Not Acceptable" if oci image in
first
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
......
patch/0032-log-message-of-get-mountpoint-failed.patch
浏览文件 @ 8c7b46d1
From 9c4d39e7c062aa130270b02ce87dfac42a75c4ee Mon Sep 17 00:00:00 2001
From 7656569d8be27ad31b1f87c687bb1ec4b17b37ba Mon Sep 17 00:00:00 2001
From: LiuHao <liuhao27@huawei.com>
Date: Thu, 5 Dec 2019 10:13:52 +0800
Subject: [PATCH 32/46] log message of get mountpoint failed
Subject: [PATCH 32/47] log message of get mountpoint failed
Signed-off-by: LiuHao <liuhao27@huawei.com>
---
......
patch/0033-Save-config-to-disk-if-images-s-name-is-removed.patch
浏览文件 @ 8c7b46d1
From 77f7a59213fdc979fab2ef6b580f6eb90bfd3125 Mon Sep 17 00:00:00 2001
From 0ea664a08284c39b006d2bc1cd14a67f94f91551 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Wed, 18 Dec 2019 07:29:06 -0500
Subject: [PATCH 33/46] Save config to disk if images's name is removed
Subject: [PATCH 33/47] Save config to disk if images's name is removed
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0034-Try-to-repair-lowers-file-if-current-layer-is-reusin.patch
浏览文件 @ 8c7b46d1
From a0ba51ab1c2ffe46f0169f6264717e7ccbc8e03e Mon Sep 17 00:00:00 2001
From 14b67e25962af75b4e18e1de35fc44832932d8ca Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Mon, 30 Dec 2019 10:20:56 +0800
Subject: [PATCH 34/46] Try to repair lowers file if current layer is reusing
Subject: [PATCH 34/47] Try to repair lowers file if current layer is reusing
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0035-Fix-CVE-2018-15664.patch
浏览文件 @ 8c7b46d1
From bdcaa36c63fc8900525e93681ba2bf4182f9b829 Mon Sep 17 00:00:00 2001
From 9bd8da9f384c662b1799aee5bcce5d2ff9e6532b Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Wed, 5 Jun 2019 15:07:44 -0400
Subject: [PATCH 35/46] Fix CVE-2018-15664
Subject: [PATCH 35/47] Fix CVE-2018-15664
Cherry-pick moby/moby #39292 for CVE-2018-15664 fixes
......
patch/0036-Change-interface-of-AES.patch
浏览文件 @ 8c7b46d1
From c4eda47ec6a07e00ff715588f2fdb54ee2fa275c Mon Sep 17 00:00:00 2001
From 120c86f9456c7f40fe7d8bba5667af4a3d4c0559 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Fri, 17 Jan 2020 02:50:13 -0500
Subject: [PATCH 36/46] Change interface of AES
Subject: [PATCH 36/47] Change interface of AES
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0037-Change-iSulad-kit-to-iSulad-img.patch
浏览文件 @ 8c7b46d1
From ab5e0997134733254de6a43efeccfc1a05f18ac5 Mon Sep 17 00:00:00 2001
From 78ed77934f124143cea589dab677449a107bef83 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 21 Jan 2020 04:04:44 -0500
Subject: [PATCH 37/46] Change iSulad-kit to iSulad-img
Subject: [PATCH 37/47] Change iSulad-kit to iSulad-img
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0038-Fix-some-devicemapper-bugs.patch
浏览文件 @ 8c7b46d1
From 40b7c7cae9936a73ba3d6c5a365248a60b835ea7 Mon Sep 17 00:00:00 2001
From 24fe6e1e07552e581eb7705f71d02d0531009f1d Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Sun, 19 Jan 2020 11:25:09 +0800
Subject: [PATCH 38/46] Fix some devicemapper bugs
Subject: [PATCH 38/47] Fix some devicemapper bugs
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0039-Fix-wrong-mount-count-and-avoid-failure-when-unmount.patch
浏览文件 @ 8c7b46d1
From f1b0bbcc169d915b97463075359ca6900c3660e5 Mon Sep 17 00:00:00 2001
From fc546285456c5af093d2de0992bcc6d4de31cb7e Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Thu, 20 Feb 2020 11:17:42 +0800
Subject: [PATCH 39/46] Fix wrong mount count and avoid failure when unmounting
Subject: [PATCH 39/47] Fix wrong mount count and avoid failure when unmounting
an unmounted mountpoint
Add lock when unmount mountpoint to avoid wrong mount count. And check if
......
patch/0040-Add-unit-test-for-devicemapper.patch
浏览文件 @ 8c7b46d1
From a4dd94f26be192cbe93e4af6f9b91d9c2a9486c4 Mon Sep 17 00:00:00 2001
From 7dcfaaa969bda19998a71689766115bd626b59a3 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Fri, 21 Feb 2020 23:06:20 -0500
Subject: [PATCH 40/46] Add unit-test for devicemapper
Subject: [PATCH 40/47] Add unit-test for devicemapper
cherry-picked devicemapper related unit-test from
https://github.com/containers/storage
......
patch/0041-Fix-testcase-TestDevmapperCreateEmpty-failed-if-umas.patch
浏览文件 @ 8c7b46d1
From d2983a8ec1d4fe086c25f34acc3f340df6cdc8da Mon Sep 17 00:00:00 2001
From 5a0fe1a5a47f02b9b8d969f6cb7758c2eb4e6a91 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 25 Feb 2020 16:56:55 +0800
Subject: [PATCH 41/46] Fix testcase TestDevmapperCreateEmpty failed if umask
Subject: [PATCH 41/47] Fix testcase TestDevmapperCreateEmpty failed if umask
is 0077
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
......
patch/0042-Delete-cached-digest-when-delete-layer.patch
浏览文件 @ 8c7b46d1
From 1ce669c30fba7d17e32b8601f2e40900ec7f3582 Mon Sep 17 00:00:00 2001
From 62d7d40f42b73e4108292893ac9ca940af8599dc Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 14 Jan 2020 22:16:25 -0500
Subject: [PATCH 42/46] Delete cached digest when delete layer
Subject: [PATCH 42/47] Delete cached digest when delete layer
Delete cached digest when delete layer. If not deleted,
load images with the same diffID will error out with message
......
patch/0043-Support-check-layer-s-diffIDs.patch
浏览文件 @ 8c7b46d1
From 50e282d70baba1275d71a08425ddbc074ca2fa57 Mon Sep 17 00:00:00 2001
From 8744e9c347fb53c3fa17a8f29a40d957c1efb3f2 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Mon, 13 Jan 2020 08:50:55 -0500
Subject: [PATCH 43/46] Support check layer's diffIDs
Subject: [PATCH 43/47] Support check layer's diffIDs
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
......
patch/0044-Update-gpgme-to-v0.1.1-to-fix-CVE-2020-8945.patch
浏览文件 @ 8c7b46d1
From 2dde50991428e4430e0f71b390d7af2776b64b6d Mon Sep 17 00:00:00 2001
From 428be43fe744a00ff08076596afb941ead0350a4 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 3 Mar 2020 05:29:52 -0500
Subject: [PATCH 44/46] Update gpgme to v0.1.1 to fix CVE-2020-8945
Subject: [PATCH 44/47] Update gpgme to v0.1.1 to fix CVE-2020-8945
https://nvd.nist.gov/vuln/detail/CVE-2020-8945
......
patch/0045-When-id-is-empty-for-overlay2-overlay-do-not-remove-.patch
浏览文件 @ 8c7b46d1
From a2fe9eca3561eff205c828bdbc6c504a4551b7cc Mon Sep 17 00:00:00 2001
From 959f7970bd588a0e48c8a606cb84d556fe73d38b Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Thu, 12 Mar 2020 14:17:11 +0800
Subject: [PATCH 45/46] When id is empty for overlay2/overlay, do not remove
Subject: [PATCH 45/47] When id is empty for overlay2/overlay, do not remove
the directories.
Signed-off-by: fanjiyun <fan.jiyun@zte.com.cn>
......
patch/0046-Sync-write-link-and-lower-files-to-avoid-broken-caus.patch
浏览文件 @ 8c7b46d1
From e9d1a46389937bc9f088dbe912386f92901c3999 Mon Sep 17 00:00:00 2001
From 327b8c7513cae78a0bfc64da061a2a105b2e7623 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Thu, 12 Mar 2020 18:17:49 +0800
Subject: [PATCH 46/46] Sync write link and lower files to avoid broken caused
Subject: [PATCH 46/47] Sync write link and lower files to avoid broken caused
by poweroff
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
......
patch/0047-Do-not-use-authorization-file-of-other-container-eng.patch 0 → 100644
浏览文件 @ 8c7b46d1
From 2705b8b5cb59b2b5572178a3a81d605875ab14d9 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Tue, 17 Mar 2020 16:07:55 +0800
Subject: [PATCH 47/47] Do not use authorization file of other container engine
If authorization file of other container engine's format changed,
pull image will failed cause by parsing authorization file error.
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
.../image/pkg/docker/config/config.go | 29 ++-----------------
1 file changed, 2 insertions(+), 27 deletions(-)
diff --git a/vendor/github.com/containers/image/pkg/docker/config/config.go b/vendor/github.com/containers/image/pkg/docker/config/config.go
index 5f73556..56a5e39 100644
--- a/vendor/github.com/containers/image/pkg/docker/config/config.go
+++ b/vendor/github.com/containers/image/pkg/docker/config/config.go
@@ -14,7 +14,6 @@ import (
"github.com/containers/storage/pkg/filelocker"
helperclient "github.com/docker/docker-credential-helpers/client"
"github.com/docker/docker-credential-helpers/credentials"
- "github.com/docker/docker/pkg/homedir"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -29,11 +28,6 @@ type dockerConfigFile struct {
}
var (
- defaultPerUIDPathFormat = filepath.FromSlash("/run/containers/%d/auth.json")
- xdgRuntimeDirPath = filepath.FromSlash("containers/auth.json")
- dockerHomePath = filepath.FromSlash(".docker/config.json")
- dockerLegacyHomePath = ".dockercfg"
-
// ErrNotLoggedIn is returned for users not logged into a registry
// that they are trying to logout of
ErrNotLoggedIn = errors.New("not logged in")
@@ -64,7 +58,6 @@ func GetAuthentication(sys *types.SystemContext, registry string) (string, strin
return sys.DockerAuthConfig.Username, sys.DockerAuthConfig.Password, nil
}
- dockerLegacyPath := filepath.Join(homedir.Get(), dockerLegacyHomePath)
var paths []string
pathToAuth, err := getPathToAuth(sys)
if err == nil {
@@ -75,11 +68,9 @@ func GetAuthentication(sys *types.SystemContext, registry string) (string, strin
// Logging the error as a warning instead and moving on to pulling the image
logrus.Warnf("%v: Trying to pull image in the event that it is a public image.", err)
}
- paths = append(paths, filepath.Join(homedir.Get(), dockerHomePath), dockerLegacyPath)
for _, path := range paths {
- legacyFormat := path == dockerLegacyPath
- username, password, err := findAuthentication(registry, path, legacyFormat)
+ username, password, err := findAuthentication(registry, path, false)
if err != nil {
return "", "", err
}
@@ -142,25 +133,9 @@ func getPathToAuth(sys *types.SystemContext) (string, error) {
if sys.AuthFilePath != "" {
return sys.AuthFilePath, nil
}
- if sys.RootForImplicitAbsolutePaths != "" {
- return filepath.Join(sys.RootForImplicitAbsolutePaths, fmt.Sprintf(defaultPerUIDPathFormat, os.Getuid())), nil
- }
}
- runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
- if runtimeDir != "" {
- // This function does not in general need to separately check that the returned path exists; that’s racy, and callers will fail accessing the file anyway.
- // We are checking for os.IsNotExist here only to give the user better guidance what to do in this special case.
- _, err := os.Stat(runtimeDir)
- if os.IsNotExist(err) {
- // This means the user set the XDG_RUNTIME_DIR variable and either forgot to create the directory
- // or made a typo while setting the environment variable,
- // so return an error referring to $XDG_RUNTIME_DIR instead of xdgRuntimeDirPath inside.
- return "", errors.Wrapf(err, "%q directory set by $XDG_RUNTIME_DIR does not exist. Either create the directory or unset $XDG_RUNTIME_DIR.", runtimeDir)
- } // else ignore err and let the caller fail accessing xdgRuntimeDirPath.
- return filepath.Join(runtimeDir, xdgRuntimeDirPath), nil
- }
- return fmt.Sprintf(defaultPerUIDPathFormat, os.Getuid()), nil
+ return "", errors.New("Missing authorization file path")
}
func decryptAuths(dir string, auths *dockerConfigFile) error {
--
2.19.1
patch/series-patch.conf
浏览文件 @ 8c7b46d1
......@@ -44,3 +44,4 @@
0044-Update-gpgme-to-v0.1.1-to-fix-CVE-2020-8945.patch
0045-When-id-is-empty-for-overlay2-overlay-do-not-remove-.patch
0046-Sync-write-link-and-lower-files-to-avoid-broken-caus.patch
0047-Do-not-use-authorization-file-of-other-container-eng.patch
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或