Run analyze and export in container

* provides PACK_REGISTRY_AUTH for authorization with registry * mounts docker.sock and runs as root for daemon Signed-off-by: Emily Casey <ecasey@pivotal.io> Signed-off-by: Matthew McNew <mmcnew@pivotal.io>
sabhiram · Dec 11, 2018 · 39f6562 · 39f6562
1 parent 125c759
commit 39f6562
Show file tree

Hide file tree

Showing 8 changed files with 203 additions and 367 deletions.
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -232,7 +232,6 @@ func testPack(t *testing.T, when spec.G, it spec.S) {
 		})
 		it.After(func() {
 			repoName := fmt.Sprintf("pack.local/run/%x", md5.Sum([]byte(sourceCodePath)))
-			killDockerByRepoName(t, repoName)
 			h.AssertNil(t, h.DockerRmi(dockerCli, repoName))
 
 			if sourceCodePath != "" {
@@ -417,9 +416,14 @@ func testPack(t *testing.T, when spec.G, it spec.S) {
 			buildOutput, err := cmd.CombinedOutput()
 			h.AssertNil(t, err)
 			defer func(origID string) { h.AssertNil(t, h.DockerRmi(dockerCli, origID)) }(h.ImageID(t, repoName))
-			expectedDetectOutput := "First Mock Buildpack: pass | Second Mock Buildpack: pass | Third Mock Buildpack: pass"
-			if !strings.Contains(string(buildOutput), expectedDetectOutput) {
-				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, expectedDetectOutput, buildOutput)
+			if !strings.Contains(string(buildOutput), "First Mock Buildpack: pass") {
+				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, "First Mock Buildpack: pass", buildOutput)
+			}
+			if !strings.Contains(string(buildOutput), "Second Mock Buildpack: pass") {
+				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, "Second Mock Buildpack: pass", buildOutput)
+			}
+			if !strings.Contains(string(buildOutput), "Third Mock Buildpack: pass") {
+				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, "Third Mock Buildpack: pass", buildOutput)
 			}
 
 			t.Log("run app container")
@@ -451,9 +455,11 @@ func testPack(t *testing.T, when spec.G, it spec.S) {
 			if !strings.Contains(string(buildOutput), latestInfo) {
 				t.Fatalf(`expected build output to contain "%s", got "%s"`, latestInfo, buildOutput)
 			}
-			expectedDetectOutput = "Latest First Mock Buildpack: pass | Third Mock Buildpack: pass"
-			if !strings.Contains(string(buildOutput), expectedDetectOutput) {
-				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, expectedDetectOutput, buildOutput)
+			if !strings.Contains(string(buildOutput), "Latest First Mock Buildpack: pass") {
+				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, "Latest First Mock Buildpack: pass", buildOutput)
+			}
+			if !strings.Contains(string(buildOutput), "Third Mock Buildpack: pass") {
+				t.Fatalf(`Expected build output to contain detection output "%s", got "%s"`, "Third Mock Buildpack: pass", buildOutput)
 			}
 
 			t.Log("run app container")

diff --git a/acceptance/testdata/mock_buildpacks/first-latest/bin/build b/acceptance/testdata/mock_buildpacks/first-latest/bin/build
@@ -6,7 +6,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-launch_dir=$3
+launch_dir=$4
 
 mkdir "$launch_dir/first-layer"
 echo "Latest First Dep Contents" > "$launch_dir/first-layer/first-dep"

diff --git a/acceptance/testdata/mock_buildpacks/first/bin/build b/acceptance/testdata/mock_buildpacks/first/bin/build
@@ -6,7 +6,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-launch_dir=$3
+launch_dir=$4
 
 mkdir "$launch_dir/first-layer"
 echo "First Dep Contents" > "$launch_dir/first-layer/first-dep"
@@ -15,4 +15,5 @@ ln -snf "$launch_dir/first-layer/first-dep" first-dep
 touch "$launch_dir/first-layer.toml"
 echo 'processes = [{ type = "web", command = "./run"}]' > "$launch_dir/launch.toml"
 
+ls -al
 echo "---> Done"
diff --git a/acceptance/testdata/mock_buildpacks/second/bin/build b/acceptance/testdata/mock_buildpacks/second/bin/build
@@ -5,7 +5,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-launch_dir=$3
+launch_dir=$4
 
 mkdir "$launch_dir/second-layer"
 echo "Second Dep Contents" > "$launch_dir/second-layer/second-dep"

diff --git a/acceptance/testdata/mock_buildpacks/third/bin/build b/acceptance/testdata/mock_buildpacks/third/bin/build
@@ -5,7 +5,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-launch_dir=$3
+launch_dir=$4
 
 mkdir "$launch_dir/third-layer"
 echo "Third Dep Contents" > "$launch_dir/third-layer/third-dep"
@@ -14,4 +14,5 @@ ln -snf "$launch_dir/third-layer/third-dep" third-dep
 touch "$launch_dir/third-layer.toml"
 echo 'processes = [{ type = "web", command = "./run"}]' > "$launch_dir/launch.toml"
 
+ls -al
 echo "---> Done"