Tag 0.9.16

As now we build only when necessary, we need to make sure the images are
built similarly. The discrepancies between the two are less now, and
they can share the same logic.

This fixes a regresion where when no prelude is defined, the build
context isn't copied over

cmd/root.go

@@ -40,7 +40,7 @@ var Verbose bool
 var LockedCommands = []string{"install", "uninstall", "upgrade"}
 
 const (
-	LuetCLIVersion = "0.9.15"
+	LuetCLIVersion = "0.9.16"
 	LuetEnvPrefix  = "LUET"
 )
 

pkg/bus/events.go

@@ -16,9 +16,9 @@ var (
 
 	// EventPackagePreBuild is the event fired before a package is being built
 	EventPackagePreBuild pluggable.EventType = "package.pre.build"
-	// EventPackagePreBuildArtifact is the event fired before a package artifact is being built
+	// EventPackagePreBuildArtifact is the event fired before a package tarball is being generated
 	EventPackagePreBuildArtifact pluggable.EventType = "package.pre.build_artifact"
-	// EventPackagePostBuildArtifact is the event fired after a package artifact was built
+	// EventPackagePostBuildArtifact is the event fired after a package tarball is generated
 	EventPackagePostBuildArtifact pluggable.EventType = "package.post.build_artifact"
 	// EventPackagePostBuild is the event fired after a package was built
 	EventPackagePostBuild pluggable.EventType = "package.post.build"

pkg/compiler/artifact_test.go

@@ -96,6 +96,7 @@ ENV PACKAGE_CATEGORY=app-admin`))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(dockerfile).To(Equal(`
 FROM luet/base
+COPY . /luetbuild
 WORKDIR /luetbuild
 ENV PACKAGE_NAME=enman
 ENV PACKAGE_VERSION=1.4.0
@@ -113,7 +114,10 @@ RUN echo bar > /test2`))
 			diffs, err := b.Changes(opts, opts2)
 			Expect(err).ToNot(HaveOccurred())
 
-			artifacts := []ArtifactNode{}
+			artifacts := []ArtifactNode{{
+				Name: "/luetbuild/LuetDockerfile",
+				Size: 175,
+			}}
 			if os.Getenv("DOCKER_BUILDKIT") == "1" {
 				artifacts = append(artifacts, ArtifactNode{Name: "/etc/resolv.conf", Size: 0})
 			}

pkg/compiler/backend/simpledocker_test.go

@@ -87,6 +87,7 @@ ENV PACKAGE_CATEGORY=app-admin`))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(dockerfile).To(Equal(`
 FROM luet/base
+COPY . /luetbuild
 WORKDIR /luetbuild
 ENV PACKAGE_NAME=enman
 ENV PACKAGE_VERSION=1.4.0
@@ -102,7 +103,10 @@ RUN echo bar > /test2`))
 			Expect(b.ImageDefinitionToTar(opts2)).ToNot(HaveOccurred())
 			Expect(helpers.Exists(filepath.Join(tmpdir, "output2.tar"))).To(BeTrue())
 
-			artifacts := []ArtifactNode{}
+			artifacts := []ArtifactNode{{
+				Name: "/luetbuild/LuetDockerfile",
+				Size: 175,
+			}}
 			if os.Getenv("DOCKER_BUILDKIT") == "1" {
 				artifacts = append(artifacts, ArtifactNode{Name: "/etc/resolv.conf", Size: 0})
 			}

pkg/compiler/compiler_test.go

@@ -50,8 +50,8 @@ var _ = Describe("Compiler", func() {
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			compiler.SetConcurrency(2)

pkg/compiler/spec.go

@@ -203,10 +203,9 @@ func (cs *LuetCompilationSpec) CopyRetrieves(dest string) error {
 	return err
 }
 
-// TODO: docker build image first. Then a backend can be used to actually spin up a container with it and run the steps within
-func (cs *LuetCompilationSpec) RenderBuildImage() (string, error) {
+func (cs *LuetCompilationSpec) genDockerfile(image string, steps []string) string {
 	spec := `
-FROM ` + cs.GetSeedImage() + `
+FROM ` + image + `
 COPY . /luetbuild
 WORKDIR /luetbuild
 ENV PACKAGE_NAME=` + cs.Package.GetName() + `
@@ -231,45 +230,22 @@ ADD ` + s + ` /luetbuild/`
 ENV ` + s
 	}
 
-	for _, s := range cs.GetPreBuildSteps() {
+	for _, s := range steps {
 		spec = spec + `
 RUN ` + s
 	}
-	return spec, nil
+	return spec
 }
 
-// TODO: docker build image first. Then a backend can be used to actually spin up a container with it and run the steps within
+// RenderBuildImage renders the dockerfile of the image used as a pre-build step
+func (cs *LuetCompilationSpec) RenderBuildImage() (string, error) {
+	return cs.genDockerfile(cs.GetSeedImage(), cs.GetPreBuildSteps()), nil
+
+}
+
+// RenderStepImage renders the dockerfile used for the image used for building the package
 func (cs *LuetCompilationSpec) RenderStepImage(image string) (string, error) {
-	spec := `
-FROM ` + image + `
-WORKDIR /luetbuild
-ENV PACKAGE_NAME=` + cs.Package.GetName() + `
-ENV PACKAGE_VERSION=` + cs.Package.GetVersion() + `
-ENV PACKAGE_CATEGORY=` + cs.Package.GetCategory()
-
-	if len(cs.Retrieve) > 0 {
-		for _, s := range cs.Retrieve {
-			//var file string
-			// if helpers.IsValidUrl(s) {
-			// 	file = s
-			// } else {
-			// 	file = cs.Rel(s)
-			// }
-			spec = spec + `
-ADD ` + s + ` /luetbuild/`
-		}
-	}
-
-	for _, s := range cs.Env {
-		spec = spec + `
-ENV ` + s
-	}
-	for _, s := range cs.BuildSteps() {
-		spec = spec + `
-RUN ` + s
-	}
-
-	return spec, nil
+	return cs.genDockerfile(image, cs.BuildSteps()), nil
 }
 
 func (cs *LuetCompilationSpec) WriteBuildImageDefinition(path string) error {

pkg/compiler/spec_test.go

@@ -96,6 +96,7 @@ ENV test=1`))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(dockerfile).To(Equal(`
 FROM luet/base
+COPY . /luetbuild
 WORKDIR /luetbuild
 ENV PACKAGE_NAME=enman
 ENV PACKAGE_VERSION=1.4.0
@@ -169,6 +170,7 @@ ENV test=1`))
 
 		Expect(dockerfile).To(Equal(`
 FROM luet/base
+COPY . /luetbuild
 WORKDIR /luetbuild
 ENV PACKAGE_NAME=a
 ENV PACKAGE_VERSION=1.0

pkg/installer/installer_test.go

@@ -60,8 +60,8 @@ var _ = Describe("Installer", func() {
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			c.SetConcurrency(2)
@@ -176,8 +176,8 @@ urls:
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			c.SetConcurrency(2)
@@ -294,8 +294,8 @@ urls:
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			c.SetConcurrency(2)
@@ -412,8 +412,8 @@ urls:
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			c.SetConcurrency(2)

pkg/installer/repository_test.go

@@ -60,8 +60,8 @@ var _ = Describe("Repository", func() {
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			compiler.SetConcurrency(1)
@@ -133,8 +133,8 @@ var _ = Describe("Repository", func() {
 			Expect(err).ToNot(HaveOccurred())
 			defer os.RemoveAll(tmpdir) // clean up
 
-			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "./generate.sh"}))
-			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2", "chmod +x generate.sh"}))
+			Expect(spec.BuildSteps()).To(Equal([]string{"echo artifact5 > /test5", "echo artifact6 > /test6", "chmod +x generate.sh", "./generate.sh"}))
+			Expect(spec.GetPreBuildSteps()).To(Equal([]string{"echo foo > /test", "echo bar > /test2"}))
 
 			spec.SetOutputPath(tmpdir)
 			spec2.SetOutputPath(tmpdir)

tests/fixtures/buildable/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/buildableseed/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/expansion/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/package_dir/dironly_filter/build.yaml

@@ -1,10 +1,10 @@
 image: "alpine"
 prelude:
   - mkdir /foo
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /foo/test5
   - echo artifact6 > /foo/test6
+  - chmod +x generate.sh
   - ./generate.sh
 package_dir: /foo
 includes:

tests/fixtures/upgrade/cat/b-1.1/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /newc
   - echo artifact6 > /newnewc
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade_integration/cat/b-1.1/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /newc
   - echo artifact6 > /newnewc
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade_integration/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade_new_repo/cat/b-1.1/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /newc
   - echo artifact6 > /newnewc
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade_old_repo/cat/b/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /test5
   - echo artifact6 > /test6
+  - chmod +x generate.sh
   - ./generate.sh

tests/fixtures/upgrade_old_repo_revision/cat/b-1.1/build.yaml

@@ -2,8 +2,8 @@ image: "alpine"
 prelude:
   - echo foo > /test
   - echo bar > /test2
-  - chmod +x generate.sh
 steps:
   - echo artifact5 > /newc
   - echo artifact6 > /newnewc
+  - chmod +x generate.sh
   - ./generate.sh