go/ko-build
1
0
Fork 0
mirror of https://github.com/ko-build/ko.git synced 2024-12-12 08:54:09 +02:00
Code Issues Releases Activity

Add author and created_by data (#45)

Browse Source 
Fixes #42
This commit is contained in:
jonjohnsonjr 2019-06-24 12:58:37 -07:00 committed by Matt Moore
parent d32f069b69
commit f46a2b6372
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/build/gobuild.go
View File

@ -41,9 +41,9 @@ type GetBase func(string) (v1.Image, error)
type builder func(string, bool) (string, error) type builder func(string, bool) (string, error)
type gobuild struct { type gobuild struct {
getBase GetBase getBase GetBase
creationTime v1.Time creationTime v1.Time
build builder build builder
disableOptimizations bool disableOptimizations bool
} }
@ -51,9 +51,9 @@ type gobuild struct {
type Option func(*gobuildOpener) error type Option func(*gobuildOpener) error
type gobuildOpener struct { type gobuildOpener struct {
getBase GetBase getBase GetBase
creationTime v1.Time creationTime v1.Time
build builder build builder
disableOptimizations bool disableOptimizations bool
} }
@ -62,9 +62,9 @@ func (gbo *gobuildOpener) Open() (Interface, error) {
return nil, errors.New("a way of providing base images must be specified, see build.WithBaseImages") return nil, errors.New("a way of providing base images must be specified, see build.WithBaseImages")
} }
return &gobuild{ return &gobuild{
getBase: gbo.getBase, getBase: gbo.getBase,
creationTime: gbo.creationTime, creationTime: gbo.creationTime,
build: gbo.build, build: gbo.build,
disableOptimizations: gbo.disableOptimizations, disableOptimizations: gbo.disableOptimizations,
}, nil }, nil
} }
@ -290,7 +290,7 @@ func (gb *gobuild) Build(s string) (v1.Image, error) {
} }
defer os.RemoveAll(filepath.Dir(file)) defer os.RemoveAll(filepath.Dir(file))
var layers []v1.Layer var layers []mutate.Addendum
// Create a layer from the kodata directory under this import path. // Create a layer from the kodata directory under this import path.
dataLayerBuf, err := tarKoData(s) dataLayerBuf, err := tarKoData(s)
if err != nil { if err != nil {
@ -303,7 +303,14 @@ func (gb *gobuild) Build(s string) (v1.Image, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
layers = append(layers, dataLayer) layers = append(layers, mutate.Addendum{
Layer: dataLayer,
History: v1.History{
Author: "ko",
CreatedBy: "ko publish " + s,
Comment: "kodata contents, at $KO_DATA_PATH",
},
})
appPath := filepath.Join(appDir, appFilename(s)) appPath := filepath.Join(appDir, appFilename(s))
@ -319,7 +326,14 @@ func (gb *gobuild) Build(s string) (v1.Image, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
layers = append(layers, binaryLayer) layers = append(layers, mutate.Addendum{
Layer: binaryLayer,
History: v1.History{
Author: "ko",
CreatedBy: "ko publish " + s,
Comment: "go build output, at " + appPath,
},
})
// Determine the appropriate base image for this import path. // Determine the appropriate base image for this import path.
base, err := gb.getBase(s) base, err := gb.getBase(s)
@ -328,7 +342,7 @@ func (gb *gobuild) Build(s string) (v1.Image, error) {
} }
// Augment the base image with our application layer. // Augment the base image with our application layer.
withApp, err := mutate.AppendLayers(base, layers...) withApp, err := mutate.Append(base, layers...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -343,8 +357,10 @@ func (gb *gobuild) Build(s string) (v1.Image, error) {
cfg = cfg.DeepCopy() cfg = cfg.DeepCopy()
cfg.Config.Entrypoint = []string{appPath} cfg.Config.Entrypoint = []string{appPath}
cfg.Config.Env = append(cfg.Config.Env, "KO_DATA_PATH="+kodataRoot) cfg.Config.Env = append(cfg.Config.Env, "KO_DATA_PATH="+kodataRoot)
cfg.ContainerConfig = cfg.Config
cfg.Author = "github.com/google/ko"
image, err := mutate.Config(withApp, cfg.Config) image, err := mutate.ConfigFile(withApp, cfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }