refactor: 整理结构和 maker 构建方式
This commit is contained in:
@@ -9,7 +9,6 @@ import (
|
||||
|
||||
"gitea.loveuer.com/yizhisec/pkg3/logger"
|
||||
"github.com/samber/lo"
|
||||
"yizhisec.com/hsv2/forge/internal/opt"
|
||||
"yizhisec.com/hsv2/forge/pkg/archiver"
|
||||
"yizhisec.com/hsv2/forge/pkg/resource"
|
||||
)
|
||||
@@ -69,7 +68,7 @@ CMD ["nginx", "-g", "daemon off;"]`
|
||||
err error
|
||||
_vendor *Vendor
|
||||
ok bool
|
||||
workdir = filepath.Join(opt.Cfg.Make.Dir, "app", "oem")
|
||||
workdir = filepath.Join(m.workdir, "app", "oem")
|
||||
output []byte
|
||||
)
|
||||
|
||||
@@ -142,7 +141,19 @@ CMD ["nginx", "-g", "daemon off;"]`
|
||||
}
|
||||
logger.Debug("✅ maker.AppOEM: docker image 构建成功, image = %s", imageName)
|
||||
|
||||
// 6. render oem.yaml
|
||||
// 6. save docker image to image dir
|
||||
logger.Debug("☑️ maker.AppOEM: 开始保存 docker image = %s 到 %s", imageName, filepath.Join(m.workdir, "image", imageName))
|
||||
if err = os.MkdirAll(filepath.Join(m.workdir, "dependency", "image"), 0o755); err != nil {
|
||||
logger.Debug("❌ maker.AppOEM: image 目录创建失败, err = %v", err)
|
||||
return err
|
||||
}
|
||||
if err = exec.CommandContext(ctx, "docker", "save", "-o", filepath.Join(m.workdir, "dependency", "image", "app.oem.tar"), imageName).Run(); err != nil {
|
||||
logger.Debug("❌ maker.AppOEM: docker image 保存失败, err = %v", err)
|
||||
return err
|
||||
}
|
||||
logger.Debug("✅ maker.AppOEM: docker image 保存成功, image = %s", imageName)
|
||||
|
||||
// 7. render oem.yaml
|
||||
logger.Debug("☑️ maker.AppOEM: 开始渲染 deployment.yaml")
|
||||
oemYAML := fmt.Sprintf(resource.YAMLAppOEM, replica, imageName)
|
||||
if err = os.WriteFile(
|
||||
|
||||
Reference in New Issue
Block a user