testing

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

e2e/compose-env.yaml

@@ -6,7 +6,7 @@ services:
   engine:
       image: 'docker:${ENGINE_VERSION:-28}-dind'
       privileged: true
-      command: ['--insecure-registry=registry:5000', '--experimental']
+      command: ['--insecure-registry=registry:5000', '--experimental', '--feature=containerd-snapshotter=false']
       environment:
         - DOCKER_TLS_CERTDIR=
 

e2e/image/push_test.go

@@ -50,6 +50,8 @@ func TestPushAllTags(t *testing.T) {
 		9:  output.Equals("v1.0: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"),
 		12: output.Equals("v1.0.1: digest: sha256:e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501 size: 528"),
 	})
+	fmt.Println("--------OUTPUT---------------")
+	fmt.Println(result.Stdout())
 }
 
 func TestPushWithContentTrust(t *testing.T) {

e2e/testdata/Dockerfile.connhelper-ssh

@@ -21,3 +21,7 @@ COPY ./connhelper-ssh/entrypoint.sh /
 EXPOSE 22
 ENTRYPOINT ["/entrypoint.sh"]
 # usage: docker run --privileged -e TEST_CONNHELPER_SSH_ID_RSA_PUB=$(cat ~/.ssh/id_rsa.pub) -p 22 $THIS_IMAGE
+
+RUN mkdir -p /etc/docker \
+ && echo '{"features": {"containerd-snapshotter": false}}' > /etc/docker/daemon.json
+

scripts/test/e2e/wait-on-daemon

@@ -7,3 +7,4 @@ while ! docker version > /dev/null; do
 done
 
 docker version
+docker info