Merge pull request #763 from dwillist/460-remove-symlink

460 remove symlink
buildpacks · Jul 27, 2020 · fd52b6a · fd52b6a
2 parents 5c7a693 + 1b2e365
commit fd52b6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -32,13 +32,12 @@ const (
 
 	cnbDir = "/cnb"
 
-	orderPath          = "/cnb/order.toml"
-	stackPath          = "/cnb/stack.toml"
-	platformDir        = "/platform"
-	lifecycleDir       = "/cnb/lifecycle"
-	compatLifecycleDir = "/lifecycle"
-	workspaceDir       = "/workspace"
-	layersDir          = "/layers"
+	orderPath    = "/cnb/order.toml"
+	stackPath    = "/cnb/stack.toml"
+	platformDir  = "/platform"
+	lifecycleDir = "/cnb/lifecycle"
+	workspaceDir = "/workspace"
+	layersDir    = "/layers"
 
 	metadataLabel = "io.buildpacks.builder.metadata"
 	stackLabel    = "io.buildpacks.stack.id"
@@ -703,15 +702,5 @@ func (b *Builder) lifecycleLayer(dest string) (string, error) {
 		return "", errors.Wrap(err, "embedding lifecycle tar")
 	}
 
-	if err := lw.WriteHeader(&tar.Header{
-		Name:     compatLifecycleDir,
-		Linkname: lifecycleDir,
-		Typeflag: tar.TypeSymlink,
-		Mode:     0644,
-		ModTime:  archive.NormalizedDateTime,
-	}); err != nil {
-		return "", errors.Wrapf(err, "creating %s symlink", style.Symbol(compatLifecycleDir))
-	}
-
 	return fh.Name(), nil
 }
diff --git a/internal/builder/builder_test.go b/internal/builder/builder_test.go
@@ -589,14 +589,6 @@ func testBuilder(t *testing.T, when spec.G, it spec.S) {
 					h.HasFileMode(0755),
 					h.HasModTime(archive.NormalizedDateTime),
 				)
-
-				it("should add lifecycle symlink", func() {
-					h.AssertOnTarEntry(t, layerTar, "/lifecycle",
-						h.SymlinksTo("/cnb/lifecycle"),
-						h.HasFileMode(0644),
-						h.HasModTime(archive.NormalizedDateTime),
-					)
-				})
 			})
 
 			it("sets the lifecycle version on the metadata", func() {

diff --git a/internal/commands/set_run_image_mirrors_test.go b/internal/commands/set_run_image_mirrors_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 func TestSetRunImageMirrorsCommand(t *testing.T) {
-	spec.Run(t, "Commands", testSetRunImageMirrorsCommand, spec.Parallel(), spec.Report(report.Terminal{}))
+	spec.Run(t, "Commands", testSetRunImageMirrorsCommand, spec.Sequential(), spec.Report(report.Terminal{}))
 }
 
 func testSetRunImageMirrorsCommand(t *testing.T, when spec.G, it spec.S) {