@@ -71,8 +71,8 @@ RUN apk --no-cache add \

     tar \

     xz

-COPY hack/test/e2e-run.sh       /scripts/run.sh

-COPY hack/make/.ensure-emptyfs  /scripts/ensure-emptyfs.sh

+COPY hack/test/e2e-run.sh           /scripts/run.sh

+COPY hack/make/.build-empty-images  /scripts/build-empty-images.sh

 COPY integration/testdata       /tests/integration/testdata

 COPY integration/build/testdata /tests/integration/build/testdata

new file mode 100644

@@ -0,0 +1,55 @@

+#!/usr/bin/env bash

+set -e

+

+function imageNotPresent {

+	local img="$1"

+	! docker image inspect "$img" > /dev/null 2> /dev/null

+}

+

+if imageNotPresent "emptyfs"; then

+	# build a "docker save" tarball for "emptyfs"

+	# see https://github.com/docker/docker/pull/5262

+	# and also https://github.com/docker/docker/issues/4242

+	dir="$DEST/emptyfs"

+	uuid=511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

+	mkdir -p "$dir/$uuid"

+	(

+		echo '[{"Config":"11f64303f0f7ffdc71f001788132bca5346831939a956e3e975c93267d89a16d.json","RepoTags":["emptyfs:latest"],"Layers":["511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar"]}]' > "$dir/manifest.json"

+		echo -n '{"architecture":"x86_64","comment":"Imported from -","container_config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2013-06-13T14:03:50.821769-07:00","docker_version":"0.4.0","history":[{"created":"2013-06-13T14:03:50.821769-07:00","comment":"Imported from -"}],"rootfs":{"type":"layers","diff_ids":["sha256:84ff92691f909a05b224e1c56abb4864f01b4f8e3c854e4bb4c7baf1d3f6d652"]}}' > "$dir/11f64303f0f7ffdc71f001788132bca5346831939a956e3e975c93267d89a16d.json"

+

+		echo '{"emptyfs":{"latest":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"}}' > "$dir/repositories"

+		cd "$dir/$uuid"

+		echo '{"id":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158","comment":"Imported from -","created":"2013-06-13T14:03:50.821769-07:00","container_config":{"Hostname":"","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"PortSpecs":null,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":null},"docker_version":"0.4.0","architecture":"x86_64","Size":0}' > json

+		echo '1.0' > VERSION

+		tar -cf layer.tar --files-from /dev/null

+	)

+	(

+		[ -n "$TESTDEBUG" ] && set -x

+		tar -cC "$dir" . | docker load

+	)

+	rm -rf "$dir"

+fi

+

+# without c8d image store, image id is the config's id

+dangling_cfg=0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43

+# with c8d image store, image id is the id of manifest/manifest list.

+dangling_mfst=16d365089e5c10e1673ee82ab5bba38ade9b763296ad918bd24b42a1156c5456

+if imageNotPresent "$dangling_cfg" && imageNotPresent "$dangling_mfst"; then

+	dir="$DEST/dangling"

+	mkdir -p "$dir"

+	(

+		cd "$dir"

+		printf '{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.docker.distribution.manifest.v2+json","digest":"sha256:16d365089e5c10e1673ee82ab5bba38ade9b763296ad918bd24b42a1156c5456","size":264,"annotations":{"org.opencontainers.image.created":"2023-05-19T08:00:44Z"},"platform":{"architecture":"amd64","os":"linux"}}]}' > index.json

+		printf '[{"Config":"blobs/sha256/0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43","RepoTags":null,"Layers":null}]' > manifest.json

+		mkdir -p blobs/sha256

+		printf '{"schemaVersion":2,"mediaType":"application/vnd.docker.distribution.manifest.v2+json","config":{"mediaType":"application/vnd.docker.container.image.v1+json","digest":"sha256:0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43","size":390},"layers":[]}' > blobs/sha256/$dangling_mfst

+		printf '{"architecture":"amd64","config":{"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"WorkingDir":"/","Labels":{"org.mobyproject.test.specialimage":"1"},"OnBuild":null},"created":null,"history":[{"created_by":"LABEL org.mobyproject.test.specialimage=1","comment":"buildkit.dockerfile.v0","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":null}}' > blobs/sha256/$dangling_cfg

+		tar -cf layer.tar --files-from /dev/null

+	)

+	(

+		[ -n "$TESTDEBUG" ] && set -x

+		tar -cC "$dir" . | docker load

+	)

+	rm -rf "$dir"

+

+fi

deleted file mode 100644

@@ -1,55 +0,0 @@

-#!/usr/bin/env bash

-set -e

-

-function imageNotPresent {

-	local img="$1"

-	! docker image inspect "$img" > /dev/null 2> /dev/null

-}

-

-if imageNotPresent "emptyfs"; then

-	# build a "docker save" tarball for "emptyfs"

-	# see https://github.com/docker/docker/pull/5262

-	# and also https://github.com/docker/docker/issues/4242

-	dir="$DEST/emptyfs"

-	uuid=511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

-	mkdir -p "$dir/$uuid"

-	(

-		echo '[{"Config":"11f64303f0f7ffdc71f001788132bca5346831939a956e3e975c93267d89a16d.json","RepoTags":["emptyfs:latest"],"Layers":["511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar"]}]' > "$dir/manifest.json"

-		echo -n '{"architecture":"x86_64","comment":"Imported from -","container_config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2013-06-13T14:03:50.821769-07:00","docker_version":"0.4.0","history":[{"created":"2013-06-13T14:03:50.821769-07:00","comment":"Imported from -"}],"rootfs":{"type":"layers","diff_ids":["sha256:84ff92691f909a05b224e1c56abb4864f01b4f8e3c854e4bb4c7baf1d3f6d652"]}}' > "$dir/11f64303f0f7ffdc71f001788132bca5346831939a956e3e975c93267d89a16d.json"

-

-		echo '{"emptyfs":{"latest":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"}}' > "$dir/repositories"

-		cd "$dir/$uuid"

-		echo '{"id":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158","comment":"Imported from -","created":"2013-06-13T14:03:50.821769-07:00","container_config":{"Hostname":"","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"PortSpecs":null,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":null},"docker_version":"0.4.0","architecture":"x86_64","Size":0}' > json

-		echo '1.0' > VERSION

-		tar -cf layer.tar --files-from /dev/null

-	)

-	(

-		[ -n "$TESTDEBUG" ] && set -x

-		tar -cC "$dir" . | docker load

-	)

-	rm -rf "$dir"

-fi

-

-# without c8d image store, image id is the config's id

-dangling_cfg=0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43

-# with c8d image store, image id is the id of manifest/manifest list.

-dangling_mfst=16d365089e5c10e1673ee82ab5bba38ade9b763296ad918bd24b42a1156c5456

-if imageNotPresent "$dangling_cfg" && imageNotPresent "$dangling_mfst"; then

-	dir="$DEST/dangling"

-	mkdir -p "$dir"

-	(

-		cd "$dir"

-		printf '{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.docker.distribution.manifest.v2+json","digest":"sha256:16d365089e5c10e1673ee82ab5bba38ade9b763296ad918bd24b42a1156c5456","size":264,"annotations":{"org.opencontainers.image.created":"2023-05-19T08:00:44Z"},"platform":{"architecture":"amd64","os":"linux"}}]}' > index.json

-		printf '[{"Config":"blobs/sha256/0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43","RepoTags":null,"Layers":null}]' > manifest.json

-		mkdir -p blobs/sha256

-		printf '{"schemaVersion":2,"mediaType":"application/vnd.docker.distribution.manifest.v2+json","config":{"mediaType":"application/vnd.docker.container.image.v1+json","digest":"sha256:0df1207206e5288f4a989a2f13d1f5b3c4e70467702c1d5d21dfc9f002b7bd43","size":390},"layers":[]}' > blobs/sha256/$dangling_mfst

-		printf '{"architecture":"amd64","config":{"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"WorkingDir":"/","Labels":{"org.mobyproject.test.specialimage":"1"},"OnBuild":null},"created":null,"history":[{"created_by":"LABEL org.mobyproject.test.specialimage=1","comment":"buildkit.dockerfile.v0","empty_layer":true}],"os":"linux","rootfs":{"type":"layers","diff_ids":null}}' > blobs/sha256/$dangling_cfg

-		tar -cf layer.tar --files-from /dev/null

-	)

-	(

-		[ -n "$TESTDEBUG" ] && set -x

-		tar -cC "$dir" . | docker load

-	)

-	rm -rf "$dir"

-

-fi

@@ -3,5 +3,5 @@ set -e

 source "$MAKEDIR/.detect-daemon-osarch"

 if [ "$DOCKER_ENGINE_GOOS" != "windows" ]; then

-	bundle .ensure-emptyfs

+	bundle .build-empty-images

 fi

@@ -81,5 +81,5 @@ set_platform_timeout() {

 	fi

 }

-sh /scripts/ensure-emptyfs.sh

+sh /scripts/build-empty-images.sh

 run_test_integration