packages/isula-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isula-build: fix apply patch failing before compiling

Browse Source 
Patch apply failed because in patch 0088, the pkgs
sorting in daemon/load.go is not ordered by
lexicographical, so patch 0102 apply failed.

Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>
(cherry picked from commit ab776685a6be7c92e852c148fedda206b3375d78)
This commit is contained in:
Lu Jingxiao 2022-01-12 15:49:33 +08:00 committed by openeuler-sync-bot
parent 57d824f19f
commit c1efcf7410
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION-openeuler
View File

@ -1 +1 @@
0.9.5-24 0.9.5-25

2
git-commit
View File

@ -1 +1 @@
df4e990bc3b46523e9cc92d132d8948e50ef7979 ccece5d21f168013a2a5b6e712d1837ecb9bde37

8
isula-build.spec
View File

@ -2,7 +2,7 @@
Name: isula-build Name: isula-build
Version: 0.9.5 Version: 0.9.5
Release: 24 Release: 25
Summary: A tool to build container images Summary: A tool to build container images
License: Mulan PSL V2 License: Mulan PSL V2
URL: https://gitee.com/openeuler/isula-build URL: https://gitee.com/openeuler/isula-build
@ -85,6 +85,12 @@ fi
/usr/share/bash-completion/completions/isula-build /usr/share/bash-completion/completions/isula-build
%changelog %changelog
* Wed Jan 12 2022 Lu Jingxiao <lujingxiao@huawei.com> - 0.9.5-25
- Type:bugfix
- CVE:NA
- SUG:restart
- DESC:fix apply patch failing before compiling
* Tue Jan 11 2022 jingxiaolu <lujingxiao@huawei.com> - 0.9.5-24 * Tue Jan 11 2022 jingxiaolu <lujingxiao@huawei.com> - 0.9.5-24
- Type:enhancement - Type:enhancement
- CVE:NA - CVE:NA

2
patch/0088-bugfix-loaded-images-cover-existing-images-name-and-.patch
View File

@ -14,10 +14,10 @@ index 41690ab..b6d675b 100644
--- a/daemon/load.go --- a/daemon/load.go
+++ b/daemon/load.go +++ b/daemon/load.go
@@ -17,6 +17,8 @@ import ( @@ -17,6 +17,8 @@ import (
+ "context"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
+ "context"
+ "strings" + "strings"
"github.com/containers/image/v5/docker/tarfile" "github.com/containers/image/v5/docker/tarfile"