use relocation map on fixup

When the fixup is performed, if the image cannot be resolved
try with the image in the relocation map if it exists.

This way a pulled application can be pushed without to require
to download locally and push all the images are they already exist
in the registry

See cnabio/cnab-to-oci#82 to have
more details about the change.

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

e2e/relocation_test.go

@@ -91,6 +91,44 @@ func TestRelocationMapRun(t *testing.T) {
 	})
 }
 
+func TestPushPulledApplication(t *testing.T) {
+	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
+		cmd := info.configuredCmd
+		cfg := getDockerConfigDir(t, cmd)
+
+		path := filepath.Join("testdata", "local")
+		ref := info.registryAddress + "/test/local:a-tag"
+		bundlePath := filepath.Join(cfg, "app", "bundles", strings.Replace(info.registryAddress, ":", "_", 1), "test", "local", "_tags", "a-tag")
+
+		// Given an application pushed on a registry
+		build(t, cmd, dockerCli, ref, path)
+		cmd.Command = dockerCli.Command("app", "push", ref)
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+		// And given local images are removed
+		cmd.Command = dockerCli.Command("rmi", "web", "local:1.1.0-beta1-invoc", "worker")
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+		// And given application files are remove
+		assert.NilError(t, os.RemoveAll(bundlePath))
+		_, err := os.Stat(filepath.Join(bundlePath, relocated.BundleFilename))
+		assert.Assert(t, os.IsNotExist(err))
+
+		// And given application is pulled from the registry
+		cmd.Command = dockerCli.Command("app", "pull", ref)
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		// Then the application can still be pushed
+		cmd.Command = dockerCli.Command("app", "push", ref)
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		// If relocation map is removed
+		assert.NilError(t, os.RemoveAll(filepath.Join(bundlePath, relocated.RelocationMapFilename)))
+
+		// Then the application cannot be pushed
+		cmd.Command = dockerCli.Command("app", "push", ref)
+		icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 1})
+	})
+}
+
 func TestRelocationMapOnInspect(t *testing.T) {
 	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
 		cmd := info.configuredCmd

internal/commands/push.go

@@ -102,6 +102,7 @@ func pushBundle(dockerCli command.Cli, bndl *relocated.Bundle, cnabRef reference
 		remotes.WithEventCallback(display.onEvent),
 		remotes.WithAutoBundleUpdate(),
 		remotes.WithPushImages(dockerCli.Client(), dockerCli.Out()),
+		remotes.WithRelocationMap(bndl.RelocationMap),
 	}
 	// bundle fixup
 	relocationMap, err := remotes.FixupBundle(context.Background(), bndl.Bundle, cnabRef, resolver, fixupOptions...)