Replace unzip with bsdtar

Joel Low · Joel Low · commit 0334ed9d17b3 · 2023-08-17T09:49:41.000+08:00
There are situations where a Zip archive from Sourcegraph causes the
directory to be improperly recreated within the container. Using
libarchive-tools fixes this.
diff --git a/docker/batch-change-volume-workspace/Dockerfile b/docker/batch-change-volume-workspace/Dockerfile
@@ -4,4 +4,4 @@
 
 FROM alpine:3.15.0@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300
 
-RUN apk add --update git unzip
+RUN apk add --update git libarchive-tools
diff --git a/internal/batches/workspace/volume_workspace.go b/internal/batches/workspace/volume_workspace.go
@@ -153,7 +153,7 @@ func (wc *dockerVolumeWorkspaceCreator) unzipRepoIntoVolume(ctx context.Context,
 		opts,
 		DockerVolumeWorkspaceImage,
 		"sh", "-c",
-		fmt.Sprintf("unzip /tmp/zip; rm /work/%s", dummy),
+		fmt.Sprintf("bsdtar -xf /tmp/zip && rm /work/%s", dummy),
 	)
 
 	if out, err := exec.CommandContext(ctx, "docker", opts...).CombinedOutput(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`FROM alpine:3.15.0@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300`
`6`	`6`
`7`		`-RUN apk add --update git unzip`
	`7`	`+RUN apk add --update git libarchive-tools`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func (wc *dockerVolumeWorkspaceCreator) unzipRepoIntoVolume(ctx context.Context,`
`153`	`153`	`opts,`
`154`	`154`	`DockerVolumeWorkspaceImage,`
`155`	`155`	`"sh", "-c",`
`156`		`- fmt.Sprintf("unzip /tmp/zip; rm /work/%s", dummy),`
	`156`	`+ fmt.Sprintf("bsdtar -xf /tmp/zip && rm /work/%s", dummy),`
`157`	`157`	`)`
`158`	`158`
`159`	`159`	`if out, err := exec.CommandContext(ctx, "docker", opts...).CombinedOutput(); err != nil {`