From 8993fb26f9a00f1ea0e5a136685615042f3f9957 Mon Sep 17 00:00:00 2001
From: DCCooper <1866858@gmail.com>
Date: Tue, 9 Feb 2021 19:50:23 +0800
Subject: [PATCH] bugfix: remove Healthcheck field when build from scratch

Signed-off-by: DCCooper <1866858@gmail.com>
---
 VERSION-openeuler                             |  2 +-
 git-commit                                    |  2 +-
 isula-build.spec                              |  8 +++++-
 ...althcheck-field-when-build-from-scra.patch | 26 +++++++++++++++++++
 series.conf                                   |  1 +
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 patch/0039-bugfix-remove-Healthcheck-field-when-build-from-scra.patch

diff --git a/VERSION-openeuler b/VERSION-openeuler
index 4de0a1d..96af73f 100644
--- a/VERSION-openeuler
+++ b/VERSION-openeuler
@@ -1 +1 @@
-0.9.5-3
+0.9.5-4
diff --git a/git-commit b/git-commit
index 8b233f1..cb21818 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-71551b69a7cea32697271820c855ae28bab4c25e
+384a5e76fd695ddef1237488f634c29337c0440c
diff --git a/isula-build.spec b/isula-build.spec
index 8d94018..f47d3fa 100644
--- a/isula-build.spec
+++ b/isula-build.spec
@@ -2,7 +2,7 @@
 
 Name: isula-build
 Version: 0.9.5
-Release: 3
+Release: 4
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
@@ -85,6 +85,12 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %changelog
+* Tue Feb 09 2021 DCCooper <1866858@gmail.com> - 0.9.5-4
+- Type:bugfix
+- CVE:NA
+- SUG:restart
+- DESC:remove Healthcheck field when build from scratch
+
 * Tue Feb 09 2021 DCCooper <1866858@gmail.com> - 0.9.5-3
 - Type:enhancement
 - CVE:NA
diff --git a/patch/0039-bugfix-remove-Healthcheck-field-when-build-from-scra.patch b/patch/0039-bugfix-remove-Healthcheck-field-when-build-from-scra.patch
new file mode 100644
index 0000000..877717d
--- /dev/null
+++ b/patch/0039-bugfix-remove-Healthcheck-field-when-build-from-scra.patch
@@ -0,0 +1,26 @@
+From dd2d69a851cba9619196166b78564093861ce46b Mon Sep 17 00:00:00 2001
+From: DCCooper <1866858@gmail.com>
+Date: Tue, 9 Feb 2021 19:11:05 +0800
+Subject: [PATCH] bugfix: remove Healthcheck field when build from scratch
+
+Signed-off-by: DCCooper <1866858@gmail.com>
+---
+ image/image.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/image/image.go b/image/image.go
+index b5b2264..bbbc7b9 100644
+--- a/image/image.go
++++ b/image/image.go
+@@ -289,7 +289,7 @@ func createScratchV2Image() *docker.Image {
+ 				ExposedPorts: make(docker.PortSet),
+ 				Env:          make([]string, 0, 0),
+ 				Cmd:          make([]string, 0, 0),
+-				Healthcheck:  &docker.HealthConfig{},
++				Healthcheck:  nil,
+ 				Volumes:      make(map[string]struct{}),
+ 				Entrypoint:   make([]string, 0, 0),
+ 				OnBuild:      make([]string, 0, 0),
+-- 
+1.8.3.1
+
diff --git a/series.conf b/series.conf
index 0dcb56e..2581ec5 100644
--- a/series.conf
+++ b/series.conf
@@ -3,3 +3,4 @@ patch/0030-xattr-support-ima-and-evm.patch
 patch/0033-isula-build-remove-docker-releated-path-for-authenti.patch
 patch/0037-isula-build-fix-goroutine-leak-problem.patch
 patch/0038-vendor-update-images-display.patch
+patch/0039-bugfix-remove-Healthcheck-field-when-build-from-scra.patch