From b386e98ddd65adb9d692fa24e6a2cdf0007ca3ca Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Sun, 5 Jan 2020 18:25:43 +0800
Subject: [PATCH] host image support container deploy:

---
 build/docker/Dockerfile.baremetal-base | 5 +++++
 pkg/hostimage/host_image_service.go    | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/build/docker/Dockerfile.baremetal-base b/build/docker/Dockerfile.baremetal-base
index ebdced27c6..f0d381369f 100644
--- a/build/docker/Dockerfile.baremetal-base
+++ b/build/docker/Dockerfile.baremetal-base
@@ -27,3 +27,8 @@ COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+
+# add mkisofs with bundles libraries
+ADD ./mkisofs /bin/mkisofs
+ADD ./.mkisofs.bin /bin/.mkisofs.bin
+ADD ./bundles/mkisofs /bin/bundles/mkisofs
diff --git a/pkg/hostimage/host_image_service.go b/pkg/hostimage/host_image_service.go
index f1fcc61ef1..1ee2f2bc3c 100644
--- a/pkg/hostimage/host_image_service.go
+++ b/pkg/hostimage/host_image_service.go
@@ -41,6 +41,7 @@ type SHostImageOptions struct {
 	common_options.CommonOptions
 	LocalImagePath    []string `help:"Local Image Paths"`
 	SnapshotDirSuffix string   `help:"Snapshot dir name equal diskId concat snapshot dir suffix" default:"_snap"`
+	CommonConfigFile  string   `help:"common config file for container"`
 }
 
 var HostImageOptions SHostImageOptions
@@ -48,6 +49,14 @@ var HostImageOptions SHostImageOptions
 func StartService() {
 	consts.SetServiceType("host-image")
 	common_options.ParseOptions(&HostImageOptions, os.Args, "host.conf", "host-image")
+	if len(HostImageOptions.CommonConfigFile) > 0 {
+		baseOpt := HostImageOptions.BaseOptions.BaseOptions
+		commonCfg := new(common_options.CommonOptions)
+		commonCfg.Config = HostImageOptions.CommonConfigFile
+		common_options.ParseOptions(commonCfg, []string{"host"}, "common.conf", "host")
+		HostImageOptions.CommonOptions = *commonCfg
+		HostImageOptions.BaseOptions.BaseOptions = baseOpt
+	}
 	HostImageOptions.EnableSsl = false
 	HostImageOptions.Port += 40000
 	app_common.InitAuth(&HostImageOptions.CommonOptions, func() {