Tag service images according to compose spec

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

internal/commands/build/build.go

@@ -159,7 +159,6 @@ func updateBundle(bundle *bundle.Bundle, resp map[string]*client.SolveResponse)
 			bundle.InvocationImages[0].Digest = digest
 		} else {
 			image := bundle.Images[service]
-			image.Image = fmt.Sprintf("%s:%s-%s", bundle.Name, bundle.Version, service)
 			image.ImageType = cnab.ImageTypeDocker
 			image.Digest = digest
 			bundle.Images[service] = image

internal/commands/build/compose.go

@@ -28,6 +28,12 @@ func parseCompose(app *types.App, options buildOptions) (map[string]build.Option
 		if service.Build == nil {
 			continue
 		}
+
+		var tags []string
+		if service.Image != nil {
+			tags = []string{*service.Image}
+		}
+
 		// FIXME docker app init should update relative paths
 		// compose file has been copied to x.dockerapp, so the relative path to build context get broken
 		contextPath := path.Join(app.Path, "..", service.Build.Context)
@@ -43,7 +49,7 @@ func parseCompose(app *types.App, options buildOptions) (map[string]build.Option
 			BuildArgs: flatten(service.Build.Args),
 			NoCache:   options.noCache,
 			Pull:      options.pull,
-			Tags:      []string{fmt.Sprintf("%s:%s-%s", app.Metadata().Name, app.Metadata().Version, service.Name)},
+			Tags:      tags,
 		}
 	}
 	return opts, nil

internal/commands/build/compose_test.go

@@ -23,7 +23,7 @@ func Test_parseCompose(t *testing.T) {
 					ContextPath:    "testdata/web",
 					DockerfilePath: "testdata/web/Dockerfile",
 				},
-				Tags: []string{"simple:1.1.0-beta1-web"},
+				Tags: []string{"frontend"},
 			},
 		},
 		{
@@ -34,7 +34,6 @@ func Test_parseCompose(t *testing.T) {
 					ContextPath:    "testdata/web",
 					DockerfilePath: "testdata/web/Dockerfile.custom",
 				},
-				Tags: []string{"context:1.1.0-beta1-web"},
 			},
 		},
 		{
@@ -46,7 +45,6 @@ func Test_parseCompose(t *testing.T) {
 					DockerfilePath: "testdata/web/Dockerfile",
 				},
 				BuildArgs: map[string]string{"foo": "bar"},
-				Tags:      []string{"withargs:1.1.0-beta1-web"},
 			},
 		},
 	}

internal/commands/build/testdata/simple.dockerapp/docker-compose.yml

@@ -2,5 +2,6 @@ version: "3.6"
 services:
   web:
     build: ./web
+    image: frontend
   dontwant:
     image: postgres:9.3

internal/commands/build/types.go

@@ -15,6 +15,7 @@ type ServiceConfig struct {
 	Name string `yaml:"-" json:"-"`
 
 	Build *ImageBuildConfig
+	Image *string
 }
 
 type ImageBuildConfig struct {