@@ -1,8 +1,8 @@

 #!/bin/bash

+set -e

 if ! docker inspect busybox &> /dev/null; then

 	if [ -d /docker-busybox ]; then

-		source "$(dirname "$BASH_SOURCE")/.ensure-scratch"

 		( set -x; docker build -t busybox /docker-busybox )

 	else

 		( set -x; docker pull busybox )

new file mode 100644

@@ -0,0 +1,22 @@

+#!/bin/bash

+set -e

+

+if ! docker inspect emptyfs &> /dev/null; then

+	# let's 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="$(mktemp -d)"

+	(

+		cd "$dir"

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

+		mkdir -p 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

+		(

+			cd 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

+			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

+		)

+	)

+	( set -x; tar -cC "$dir" . | docker load )

+	rm -rf "$dir"

+fi

deleted file mode 100644

@@ -1,21 +0,0 @@

-#!/bin/bash

-

-if ! docker inspect scratch &> /dev/null; then

-	# let's build a "docker save" tarball for "emptyfs"

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

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

-	mkdir -p /docker-scratch

-	(

-		cd /docker-scratch

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

-		mkdir -p 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

-		(

-			cd 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158

-			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

-		)

-	)

-	( set -x; tar -cf /docker-scratch.tar -C /docker-scratch . )

-	( set -x; docker load --input /docker-scratch.tar )

-fi

@@ -20,6 +20,7 @@ bundle_test_integration_cli() {

 		sleep 2

 		source "$(dirname "$BASH_SOURCE")/.ensure-busybox"

+		source "$(dirname "$BASH_SOURCE")/.ensure-emptyfs"

 		bundle_test_integration_cli

 	}; then