Update "opt disabling" patch to use the correct plugin ID

Also, update testing to reproduce the original failure. 🚀

moby-containerd/debian/changelog

@@ -1,3 +1,9 @@
+moby-containerd (1.6.32-2) UNRELEASED; urgency=medium
+
+  * Update "opt disabling" patch to use the correct plugin ID
+
+ -- Tianon Gravi <[email protected]>  Fri, 24 May 2024 13:50:41 -0700
+
 moby-containerd (1.6.32-1) unstable; urgency=medium
 
   * Update to 1.6.32

moby-containerd/debian/patches/disable-opt-plugin.patch

@@ -10,7 +10,7 @@ index b121df0c6..4bff33335 100644
  			MaxSendMsgSize: defaults.DefaultMaxSendMsgSize,
  		},
 -		DisabledPlugins:  []string{},
-+		DisabledPlugins:  []string{"opt"},
++		DisabledPlugins:  []string{"io.containerd.internal.v1.opt"},
  		RequiredPlugins:  []string{},
  		StreamProcessors: streamProcessors(),
  	}

test-debs.sh

@@ -39,23 +39,36 @@ cat <<-'EOBASH'
 
 	apt-get update -qq
 	arch="$(dpkg --print-architecture)"
-	apt-get install -yqq --no-install-recommends -V ca-certificates iptables /debs/moby-*_"${arch}".deb
+	apt-get install -yqq --no-install-recommends -V ca-certificates iptables git /debs/moby-*_"${arch}".deb
 
 	containerd --version
 	ctr --version
 	docker --version
 	docker buildx version
 	runc --version
 
-	containerd &
+	containerd & pid="$!"
 	timeout 10s sh -c "while ! ctr version; do sleep 1; done"
 
+	if ctr plugins ls | grep opt; then
+		exit 1
+	fi
+
 	ctr image pull docker.io/library/hello-world:latest
 	ctr run --rm docker.io/library/hello-world:latest hello
 
+	# stop "containerd" so dockerd can start it up and we can test the "dockerd starts/manages containerd" behavior
+	kill "$pid"
+	wait "$pid"
+	# TODO also clear out containerd state?
+
 	dockerd &
 	timeout 10s sh -c "while ! docker version; do sleep 1; done"
 
+	if ctr -a /run/docker/containerd/containerd.sock plugins ls | grep opt; then
+		exit 1
+	fi
+
 	docker run --rm hello-world
 	docker run --rm --init hello-world
 
@@ -66,7 +79,9 @@ cat <<-'EOBASH'
 	docker buildx create --name tianon --node tianon --driver docker-container --driver-opt image=tianon/buildkit --bootstrap
 	printf 'FROM hello-world\nRUN ["/hello"]' | docker buildx build --builder tianon --tag hello-build:buildx -
 
-	docker image inspect --format '.' hello-build:classic hello-build:buildkit hello-build:buildx > /dev/null
+	docker buildx build --tag hello-build:buildx-git 'https://github.com/docker-library/hello-world.git#3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee:amd64/hello-world'
+
+	docker image inspect --format '.' hello-build:classic hello-build:buildkit hello-build:buildx hello-build:buildx-git > /dev/null
 
 	docker images
 EOBASH