Support docker uri for lifecycle

pkg/client/create_builder.go

@@ -1,8 +1,12 @@
 package client
 
 import (
+	"archive/tar"
 	"context"
 	"fmt"
+	"io"
+	OS "os"
+	"path/filepath"
 	"sort"
 	"strings"
 
@@ -264,6 +268,11 @@ func (c *Client) fetchLifecycle(ctx context.Context, config pubbldr.LifecycleCon
 	var uri string
 	var err error
 	switch {
+	case buildpack.HasDockerLocator(config.URI):
+		uri, err = c.uriFromLifecycleImage(ctx, relativeBaseDir, config)
+		if err != nil {
+			return nil, errors.Wrap(err, "Could not parse uri from lifecycle image")
+		}
 	case config.Version != "":
 		v, err := semver.NewVersion(config.Version)
 		if err != nil {
@@ -436,3 +445,78 @@ func (c *Client) uriFromLifecycleVersion(version semver.Version, os string, arch
 
 	return fmt.Sprintf("https://github.com/buildpacks/lifecycle/releases/download/v%s/lifecycle-v%s+linux.%s.tgz", version.String(), version.String(), arch)
 }
+
+func stripTopDirAndWrite(layerReader io.ReadCloser, outputPath string) (*OS.File, error) {
+	file, err := OS.Create(outputPath)
+	if err != nil {
+		return nil, err
+	}
+
+	tarWriter := tar.NewWriter(file)
+	tarReader := tar.NewReader(layerReader)
+	tarReader.Next()
+
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		pathSep := string(OS.PathSeparator)
+		cnbPrefix := fmt.Sprintf("%scnb%s", pathSep, pathSep)
+		newHeader := *header
+		newHeader.Name = strings.TrimPrefix(header.Name, cnbPrefix)
+
+		if err := tarWriter.WriteHeader(&newHeader); err != nil {
+			return nil, err
+		}
+
+		if _, err := io.Copy(tarWriter, tarReader); err != nil {
+			return nil, err
+		}
+	}
+
+	return file, nil
+}
+
+func (c *Client) uriFromLifecycleImage(ctx context.Context, basePath string, config pubbldr.LifecycleConfig) (uri string, err error) {
+	var lifecycleImage imgutil.Image
+	imageName := buildpack.ParsePackageLocator(config.URI)
+	c.logger.Debugf("Downloading lifecycle image: %s", style.Symbol(imageName))
+
+	lifecycleImage, err = c.imageFetcher.Fetch(ctx, imageName, image.FetchOptions{Daemon: false})
+	if err != nil {
+		return "", nil
+	}
+
+	lifecyclePath := filepath.Join(basePath, "lifecycle.tar")
+	layers, err := lifecycleImage.UnderlyingImage().Layers()
+	if err != nil {
+		return "", err
+	}
+
+	// Assume the last layer has the lifecycle
+	lifecycleLayer := layers[len(layers)-1]
+
+	layerReader, err := lifecycleLayer.Uncompressed()
+	if err != nil {
+		return "", err
+	}
+	defer layerReader.Close()
+
+	file, err := stripTopDirAndWrite(layerReader, lifecyclePath)
+	if err != nil {
+		return "", err
+	}
+
+	defer file.Close()
+
+	uri, err = paths.FilePathToURI(lifecyclePath, "")
+	if err != nil {
+		return "", err
+	}
+	return uri, err
+}