Add an e2e on the bundle command using a docker in docker

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

e2e/commands_test.go

@@ -276,6 +276,58 @@ func TestAttachmentsWithRegistry(t *testing.T) {
 	assert.Assert(t, strings.Contains(resultOutput, "nesteddir/nested2/nested3/config3.cfg"))
 }
 
+func TestBundle(t *testing.T) {
+	tmpDir := fs.NewDir(t, t.Name())
+	defer tmpDir.Remove()
+	// Using a custom DOCKER_CONFIG to store contexts in a temporary directory
+	cmd := icmd.Cmd{Env: append(os.Environ(), "DOCKER_CONFIG="+tmpDir.Path())}
+
+	// Running a docker in docker to bundle the application
+	dind := NewContainer("docker:18.09-dind", 2375)
+	dind.Start(t)
+	defer dind.Stop(t)
+
+	// Create a build context
+	cmd.Command = []string{dockerCli, "context", "create", "build-context", "--docker", fmt.Sprintf(`"host=tcp://%s"`, dind.GetAddress(t))}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	// The dind doesn't have the cnab-app-base image so we save it in order to load it later
+	cmd.Command = []string{dockerCli, "save", fmt.Sprintf("docker/cnab-app-base:%s", internal.Version), "-o", tmpDir.Join("cnab-app-base.tar.gz")}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	cmd.Env = append(cmd.Env, "DOCKER_CONTEXT=build-context")
+	cmd.Command = []string{dockerCli, "load", "-i", tmpDir.Join("cnab-app-base.tar.gz")}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	// Bundle the docker application package to a CNAB bundle, using the build-context.
+	cmd.Command = []string{dockerApp, "bundle", filepath.Join("testdata", "simple", "simple.dockerapp"), "--out", tmpDir.Join("bundle.json")}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	// Check the resulting CNAB bundle.json
+	golden.Assert(t, string(golden.Get(t, tmpDir.Join("bundle.json"))), "simple-bundle.json.golden")
+
+	// List the images on the build context daemon and checks the invocation image is there
+	cmd.Command = []string{dockerCli, "image", "ls", "--format", "{{.Repository}}:{{.Tag}}"}
+	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "acmecorp/simple:1.1.0-beta1-invoc"})
+
+	// Copy all the files from the invocation image and check them
+	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "acmecorp/simple:1.1.0-beta1-invoc"}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	cmd.Command = []string{dockerCli, "cp", "invocation:/cnab/app/simple.dockerapp", tmpDir.Join("simple.dockerapp")}
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	appDir := filepath.Join("testdata", "simple", "simple.dockerapp")
+	manifest := fs.Expected(
+		t,
+		fs.WithMode(0755),
+		fs.WithFile(internal.MetadataFileName, readFile(t, filepath.Join(appDir, internal.MetadataFileName)), fs.WithMode(0644)),
+		fs.WithFile(internal.ComposeFileName, readFile(t, filepath.Join(appDir, internal.ComposeFileName)), fs.WithMode(0644)),
+		fs.WithFile(internal.ParametersFileName, readFile(t, filepath.Join(appDir, internal.ParametersFileName)), fs.WithMode(0644)),
+	)
+
+	assert.Assert(t, fs.Equal(tmpDir.Join("simple.dockerapp"), manifest))
+}
+
 func TestDeployDockerApp(t *testing.T) {
 	tmpDir := fs.NewDir(t, t.Name())
 	defer tmpDir.Remove()

e2e/testdata/simple-bundle.json.golden

@@ -0,0 +1,118 @@
+{
+	"name": "acmecorp/simple",
+	"version": "1.1.0-beta1",
+	"description": "new fancy webapp with microservices",
+	"maintainers": [
+		{
+			"name": "John Developer",
+			"email": "john.dev@acmecorp.cool",
+			"url": ""
+		},
+		{
+			"name": "Jane Developer",
+			"email": "jane.dev@acmecorp.cool",
+			"url": ""
+		}
+	],
+	"invocationImages": [
+		{
+			"imageType": "docker",
+			"image": "acmecorp/simple:1.1.0-beta1-invoc"
+		}
+	],
+	"images": {
+		"api": {
+			"imageType": "docker",
+			"image": "python:3.6",
+			"description": "python:3.6",
+			"refs": null
+		},
+		"db": {
+			"imageType": "docker",
+			"image": "postgres:9.3",
+			"description": "postgres:9.3",
+			"refs": null
+		},
+		"web": {
+			"imageType": "docker",
+			"image": "nginx:latest",
+			"description": "nginx:latest",
+			"refs": null
+		}
+	},
+	"actions": {
+		"inspect": {
+			"Modifies": false
+		},
+		"status": {
+			"Modifies": false
+		}
+	},
+	"parameters": {
+		"api_host": {
+			"type": "string",
+			"defaultValue": "coolapp.com",
+			"required": false,
+			"metadata": {},
+			"destination": {
+				"path": "",
+				"env": "docker_param1"
+			}
+		},
+		"docker.kubernetes-namespace": {
+			"type": "string",
+			"defaultValue": "",
+			"required": false,
+			"metadata": {
+				"description": "Namespace in which to deploy"
+			},
+			"destination": {
+				"path": "",
+				"env": "DOCKER_KUBERNETES_NAMESPACE"
+			}
+		},
+		"docker.orchestrator": {
+			"type": "string",
+			"defaultValue": "",
+			"allowedValues": [
+				"",
+				"swarm",
+				"kubernetes"
+			],
+			"required": false,
+			"metadata": {
+				"description": "Orchestrator on which to deploy"
+			},
+			"destination": {
+				"path": "",
+				"env": "DOCKER_STACK_ORCHESTRATOR"
+			}
+		},
+		"static_subdir": {
+			"type": "string",
+			"defaultValue": "data/static",
+			"required": false,
+			"metadata": {},
+			"destination": {
+				"path": "",
+				"env": "docker_param2"
+			}
+		},
+		"web_port": {
+			"type": "string",
+			"defaultValue": "8082",
+			"required": false,
+			"metadata": {},
+			"destination": {
+				"path": "",
+				"env": "docker_param3"
+			}
+		}
+	},
+	"credentials": {
+		"docker.context": {
+			"path": "/cnab/app/context.dockercontext",
+			"env": ""
+		}
+	}
+}