diff --git a/cmd/build.go b/cmd/build.go index ded9db5b..c7130630 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -35,6 +35,7 @@ var buildCmd = &cobra.Command{ Short: "build a package or a tree", Long: `build packages or trees from luet tree definitions. Packages are in [category]/[name]-[version] form`, PreRun: func(cmd *cobra.Command, args []string) { + viper.BindPFlag("clean", cmd.Flags().Lookup("clean")) viper.BindPFlag("tree", cmd.Flags().Lookup("tree")) viper.BindPFlag("destination", cmd.Flags().Lookup("destination")) viper.BindPFlag("backend", cmd.Flags().Lookup("backend")) diff --git a/pkg/compiler/compiler.go b/pkg/compiler/compiler.go index caef184d..851e9d6a 100644 --- a/pkg/compiler/compiler.go +++ b/pkg/compiler/compiler.go @@ -44,7 +44,7 @@ type LuetCompiler struct { CompressionType CompressionImplementation } -func NewLuetCompiler(backend CompilerBackend, db pkg.PackageDatabase, opt CompilerOptions) Compiler { +func NewLuetCompiler(backend CompilerBackend, db pkg.PackageDatabase, opt *CompilerOptions) Compiler { // The CompilerRecipe will gives us a tree with only build deps listed. return &LuetCompiler{ Backend: backend, @@ -229,6 +229,7 @@ func (cs *LuetCompiler) stripIncludesFromRootfs(includes []string, rootfs string func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage string, concurrency int, keepPermissions, keepImg bool, p CompilationSpec) (Artifact, error) { if !cs.Clean { if art, err := LoadArtifactFromYaml(p); err == nil { + Debug("Artifact reloaded. Skipping build") return art, err } } @@ -389,6 +390,7 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage func (cs *LuetCompiler) packageFromImage(p CompilationSpec, tag string, keepPermissions, keepImg bool, concurrency int) (Artifact, error) { if !cs.Clean { if art, err := LoadArtifactFromYaml(p); err == nil { + Debug("Artifact reloaded. Skipping build") return art, err } } diff --git a/pkg/compiler/interface.go b/pkg/compiler/interface.go index b48c283d..fbe334da 100644 --- a/pkg/compiler/interface.go +++ b/pkg/compiler/interface.go @@ -50,8 +50,8 @@ type CompilerOptions struct { Clean bool } -func NewDefaultCompilerOptions() CompilerOptions { - return CompilerOptions{ +func NewDefaultCompilerOptions() *CompilerOptions { + return &CompilerOptions{ ImageRepository: "luet/cache", PullFirst: true, CompressionType: None,