remove usage of image-map.json file

`cnab-go` adds two files to the invocation image:
- `/cnab/bundle.json`: containing the whole `bundle.json`
- `/cnab/app/image-map.json`: containing `Images` section of the bundle

As this second file is only an extract of the Bundle it can safely be removed.

The full removal needs to be done in `cnab-go`, here we only ignore it.

Signed-off-by: Yves Brissaud <[email protected]>

Author: eunomie

cmd/cnab-run/bundle.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"github.com/deislabs/cnab-go/bundle"
+	"github.com/docker/app/internal/relocated"
+)
+
+const (
+	// bundlePath is where the CNAB runtime will put the actual Bundle definition
+	bundlePath = "/cnab/bundle.json"
+)
+
+func getBundle() (*bundle.Bundle, error) {
+	return relocated.BundleJSON(bundlePath)
+}

cmd/cnab-run/inspect.go

@@ -15,11 +15,11 @@ func inspectAction(instanceName string) error {
 	}
 	defer app.Cleanup()
 
-	imageMap, err := getBundleImageMap()
+	bndl, err := getBundle()
 	if err != nil {
 		return err
 	}
 
 	parameters := packager.ExtractCNABParametersValues(packager.ExtractCNABParameterMapping(app.Parameters()), os.Environ())
-	return appinspect.ImageInspect(os.Stdout, app, parameters, imageMap)
+	return appinspect.ImageInspect(os.Stdout, app, parameters, bndl.Images)
 }

cmd/cnab-run/install.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/render"
@@ -19,12 +18,6 @@ import (
 	"github.com/spf13/pflag"
 )
 
-const (
-	// imageMapFilePath is the path where the CNAB runtime will put the actual
-	// service to image mapping to use
-	imageMapFilePath = "/cnab/app/image-map.json"
-)
-
 func installAction(instanceName string) error {
 	cli, err := setupDockerContext()
 	if err != nil {
@@ -42,12 +35,12 @@ func installAction(instanceName string) error {
 	if err != nil {
 		return err
 	}
-	imageMap, err := getBundleImageMap()
+	bndl, err := getBundle()
 	if err != nil {
 		return err
 	}
 	parameters := packager.ExtractCNABParametersValues(packager.ExtractCNABParameterMapping(app.Parameters()), os.Environ())
-	rendered, err := render.Render(app, parameters, imageMap)
+	rendered, err := render.Render(app, parameters, bndl.Images)
 	if err != nil {
 		return err
 	}
@@ -79,18 +72,6 @@ func getFlagset(orchestrator command.Orchestrator) *pflag.FlagSet {
 	return result
 }
 
-func getBundleImageMap() (map[string]bundle.Image, error) {
-	mapJSON, err := ioutil.ReadFile(imageMapFilePath)
-	if err != nil {
-		return nil, err
-	}
-	var result map[string]bundle.Image
-	if err := json.Unmarshal(mapJSON, &result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
 func addLabels(rendered *composetypes.Config) error {
 	args, err := ioutil.ReadFile(internal.DockerArgsPath)
 	if err != nil {

cmd/cnab-run/render.go

@@ -19,7 +19,7 @@ func renderAction(instanceName string) error {
 	}
 	defer app.Cleanup()
 
-	imageMap, err := getBundleImageMap()
+	bndl, err := getBundle()
 	if err != nil {
 		return err
 	}
@@ -31,7 +31,7 @@ func renderAction(instanceName string) error {
 
 	parameters := packager.ExtractCNABParametersValues(packager.ExtractCNABParameterMapping(app.Parameters()), os.Environ())
 
-	rendered, err := render.Render(app, parameters, imageMap)
+	rendered, err := render.Render(app, parameters, bndl.Images)
 	if err != nil {
 		return err
 	}

internal/relocated/bundle.go

@@ -32,7 +32,7 @@ func FromBundle(bndl *bundle.Bundle) *Bundle {
 
 // BundleFromFile creates a relocated bundle based on the bundle file and relocation map.
 func BundleFromFile(filename string) (*Bundle, error) {
-	bndl, err := bundleJSON(filename)
+	bndl, err := BundleJSON(filename)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to read bundle")
 	}
@@ -75,7 +75,7 @@ func (b *Bundle) Store(dir string) error {
 	return nil
 }
 
-func bundleJSON(bundlePath string) (*bundle.Bundle, error) {
+func BundleJSON(bundlePath string) (*bundle.Bundle, error) {
 	data, err := ioutil.ReadFile(bundlePath)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to read file %s", bundlePath)