Fix reference for service images we know by tag

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

Author: ndeloof

e2e/build_test.go

@@ -43,6 +43,11 @@ func TestBuild(t *testing.T) {
 			icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		}
 
+		for _, img := range bndl.Images {
+			// Check all image not being built locally get a fixed reference
+			assert.Assert(t, img.Image == "" || strings.Contains(img.Image, "@sha256:"))
+		}
+
 		_, err = os.Stat(iidfile)
 		assert.NilError(t, err)
 		bytes, err := ioutil.ReadFile(iidfile)

e2e/commands_test.go

@@ -75,15 +75,14 @@ func TestRenderFormatters(t *testing.T) {
 		cmd := info.configuredCmd
 
 		contextPath := filepath.Join("testdata", "simple")
-		appPath := filepath.Join(contextPath, "simple.dockerapp")
-		cmd.Command = dockerCli.Command("app", "build", "--tag", "a-simple-tag", contextPath)
+		cmd.Command = dockerCli.Command("app", "build", "--tag", "a-simple-tag", "--no-resolve-image", contextPath)
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
-		cmd.Command = dockerCli.Command("app", "render", "--formatter", "json", appPath)
+		cmd.Command = dockerCli.Command("app", "render", "--formatter", "json", "a-simple-tag")
 		result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		golden.Assert(t, result.Stdout(), "expected-json-render.golden")
 
-		cmd.Command = dockerCli.Command("app", "render", "--formatter", "yaml", appPath)
+		cmd.Command = dockerCli.Command("app", "render", "--formatter", "yaml", "a-simple-tag")
 		result = icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		golden.Assert(t, result.Stdout(), "expected-yaml-render.golden")
 	})

e2e/testdata/expected-json-render.golden

@@ -17,7 +17,7 @@
         "resources": {},
         "placement": {}
       },
-      "image": "python:3.6",
+      "image": "python:3.6@sha256:52f872eae9755743c9494e0e3cf02a47d34b42032cab1e5ab777b30c3665d5f1",
       "networks": {
         "back": null,
         "front": {
@@ -35,7 +35,7 @@
         "resources": {},
         "placement": {}
       },
-      "image": "postgres:9.3",
+      "image": "postgres:9.3@sha256:3cd40afb5803762170a1149ade6962fe24d405b3ccf2fe499ff1428635520a17",
       "networks": {
         "back": null
       }
@@ -47,7 +47,7 @@
         "resources": {},
         "placement": {}
       },
-      "image": "nginx:latest",
+      "image": "nginx:latest@sha256:922c815aa4df050d4df476e92daed4231f466acc8ee90e0e774951b0fd7195a4",
       "networks": {
         "front": null
       },

e2e/testdata/expected-yaml-render.golden

@@ -1,19 +1,19 @@
 version: "3.6"
 services:
   api:
-    image: python:3.6
+    image: python:3.6@sha256:52f872eae9755743c9494e0e3cf02a47d34b42032cab1e5ab777b30c3665d5f1
     networks:
       back: null
       front:
         aliases:
         - api.example.com
         - example.com
   db:
-    image: postgres:9.3
+    image: postgres:9.3@sha256:3cd40afb5803762170a1149ade6962fe24d405b3ccf2fe499ff1428635520a17
     networks:
       back: null
   web:
-    image: nginx:latest
+    image: nginx:latest@sha256:922c815aa4df050d4df476e92daed4231f466acc8ee90e0e774951b0fd7195a4
     networks:
       front: null
     ports:

internal/commands/build/build.go

@@ -12,6 +12,11 @@ import (
 	"strconv"
 	"strings"
 
+	errors2 "github.com/pkg/errors"
+
+	"github.com/docker/app/internal"
+	"github.com/docker/cnab-to-oci/remotes"
+
 	"github.com/deislabs/cnab-go/bundle"
 	cnab "github.com/deislabs/cnab-go/driver"
 	"github.com/docker/app/internal/packager"
@@ -130,7 +135,7 @@ func runBuild(dockerCli command.Cli, contextPath string, opt buildOptions) error
 }
 
 func buildImageUsingBuildx(app *types.App, contextPath string, opt buildOptions, dockerCli command.Cli) (*bundle.Bundle, error) {
-	buildopts, err := parseCompose(app, contextPath, opt)
+	buildopts, pulledServices, err := parseCompose(app, contextPath, opt)
 	if err != nil {
 		return nil, err
 	}
@@ -178,9 +183,42 @@ func buildImageUsingBuildx(app *types.App, contextPath string, opt buildOptions,
 	if err != nil {
 		return nil, err
 	}
+
+	if !opt.noResolveImage {
+		if err = fixServiceImageReferences(ctx, dockerCli, bundle, pulledServices); err != nil {
+			return nil, err
+		}
+	}
+
 	return bundle, nil
 }
 
+func fixServiceImageReferences(ctx context.Context, dockerCli command.Cli, bundle *bundle.Bundle, pulledServices []ServiceConfig) error {
+	insecureRegistries, err := internal.InsecureRegistriesFromEngine(dockerCli)
+	if err != nil {
+		return errors2.Wrapf(err, "could not retrieve insecure registries")
+	}
+	resolver := remotes.CreateResolver(dockerCli.ConfigFile(), insecureRegistries...)
+	for _, service := range pulledServices {
+		image := bundle.Images[service.Name]
+		ref, err := reference.ParseNormalizedNamed(*service.Image)
+		if err != nil {
+			return errors2.Wrapf(err, "could not resolve image %s", *service.Image)
+		}
+		_, desc, err := resolver.Resolve(ctx, ref.String())
+		if err != nil {
+			return errors2.Wrapf(err, "could not resolve image %s", ref.Name())
+		}
+		canonical, err := reference.WithDigest(ref, desc.Digest)
+		if err != nil {
+			return errors2.Wrapf(err, "could not resolve image %s", ref.Name())
+		}
+		image.Image = canonical.String()
+		bundle.Images[service.Name] = image
+	}
+	return nil
+}
+
 func getAppFolder(opt buildOptions, contextPath string) (string, error) {
 	application := opt.folder
 	if application == "" {

internal/commands/build/compose.go

@@ -12,20 +12,22 @@ import (
 
 // parseCompose do parse app compose file and extract buildx Options
 // We don't rely on bake's ReadTargets + TargetsToBuildOpt here as we have to skip environment variable interpolation
-func parseCompose(app *types.App, contextPath string, options buildOptions) (map[string]build.Options, error) {
+func parseCompose(app *types.App, contextPath string, options buildOptions) (map[string]build.Options, []ServiceConfig, error) {
 	parsed, err := loader.ParseYAML(app.Composes()[0])
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	services, err := load(parsed, options.args)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to parse compose file: %s", err)
+		return nil, nil, fmt.Errorf("Failed to parse compose file: %s", err)
 	}
 
+	pulledServices := []ServiceConfig{}
 	opts := map[string]build.Options{}
 	for _, service := range services {
 		if service.Build == nil {
+			pulledServices = append(pulledServices, service)
 			continue
 		}
 		var tags []string
@@ -47,7 +49,7 @@ func parseCompose(app *types.App, contextPath string, options buildOptions) (map
 			Tags:      tags,
 		}
 	}
-	return opts, nil
+	return opts, pulledServices, nil
 }
 
 func flatten(in compose.MappingWithEquals) map[string]string {

internal/commands/build/compose_test.go

@@ -51,7 +51,7 @@ func Test_parseCompose(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			app, err := packager.Extract("testdata/" + tt.name)
 			assert.NilError(t, err)
-			got, err := parseCompose(app, "testdata", buildOptions{})
+			got, _, err := parseCompose(app, "testdata", buildOptions{})
 			assert.NilError(t, err)
 			_, ok := got["dontwant"]
 			assert.Assert(t, !ok, "parseCompose() should have excluded 'dontwant' service")