From de7ec5b8bb0086e5b9dec90bf468ab73d8ae33fa Mon Sep 17 00:00:00 2001 From: RouxAntoine Date: Fri, 7 Jan 2022 21:55:38 +0100 Subject: [PATCH] move build argument to manifest level --- image.go | 8 +++++--- main.go | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/image.go b/image.go index 61d2d6f..0dee240 100644 --- a/image.go +++ b/image.go @@ -22,9 +22,10 @@ type ManifestImage struct { Image layers Layers buildDir string + buildOpt string } -func NewManifest(imageName string, imageTag string, buildDir string, platforms []string) ManifestImage { +func NewManifest(imageName string, imageTag string, buildDir string, platforms []string, buildOpt string) ManifestImage { return ManifestImage{ Image: Image{ imageName, @@ -32,13 +33,14 @@ func NewManifest(imageName string, imageTag string, buildDir string, platforms [ }, layers: NewLayers(imageName, platforms), buildDir: buildDir, + buildOpt: buildOpt, } } // CreateLayers build and push each layer image -func (manifest *ManifestImage) CreateLayers(registry Registry, buildOpt string) { +func (manifest *ManifestImage) CreateLayers(registry Registry) { for _, layer := range manifest.layers { - layer.CreateLayer(registry, manifest.buildDir, buildOpt) + layer.CreateLayer(registry, manifest.buildDir, manifest.buildOpt) } } diff --git a/main.go b/main.go index 0605e0b..aacee10 100644 --- a/main.go +++ b/main.go @@ -15,19 +15,18 @@ func main() { 5000, } - var manifests []ManifestImage - - manifests = append(manifests, + manifests := []ManifestImage{ NewManifest( "registry-ui", "latest", "../rasp/registry/ui/", []string{"linux/arm/v6"}, + "", ), - ) + } for _, manifest := range manifests { - manifest.CreateLayers(myRegistry, "") + manifest.CreateLayers(myRegistry) manifest.CreateManifest(myRegistry) } }