!208 [sync] PR-206: isula-build: refactor image separator

Merge pull request !208 from openeuler-sync-bot/sync-pr206-2003sp1-to-openEuler-20.03-LTS-SP3

VERSION-openeuler

@@ -1 +1 @@
-0.9.5-23
+0.9.5-25

git-commit

@@ -1 +1 @@
-deae3981c0c97d8331b5eaac98d1db08ec0f488e
+ccece5d21f168013a2a5b6e712d1837ecb9bde37

isula-build.spec

@@ -2,7 +2,7 @@
 
 Name: isula-build
 Version: 0.9.5
-Release: 23
+Release: 25
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
@@ -85,6 +85,18 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %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
+- Type:enhancement
+- CVE:NA
+- SUG:restart
+- DESC:refactor image separator related
+
 * Thu Dec 23 2021 DCCooper <1866858@huawei.com> - 0.9.5-23
 - Type:bugfix
 - CVE:NA

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

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

series.conf

@@ -64,3 +64,4 @@ patch/0098-tests-fix-testcase-TestPrepareFromImage.patch
 patch/0099-fix-some-little-mistakes-in-manual_zh.md.patch
 patch/0100-fix-the-message-is-not-rational-when-not-appoint-Doc.patch
 patch/0101-utils-remove-unused-PBKDF2-and-AES-related.patch
+patch/0102-Refactor-refactor-image-separator-related.patch