Merge branch 'containerd:main' into add-support-cvmfs-snapshotter

containerd · Oct 27, 2023 · 41a9f7f · 41a9f7f
2 parents 1c75fbf + 2becba6
commit 41a9f7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Vagrantfile.freebsd b/Vagrantfile.freebsd
@@ -18,6 +18,8 @@
 # Vagrantfile for FreeBSD
 Vagrant.configure("2") do |config|
   config.vm.box = "generic/freebsd13"
+  # workaround for https://github.com/containerd/nerdctl/issues/2596
+  config.vm.box_version = "4.3.2"
 
   memory = 2048
   cpus = 1

diff --git a/cmd/nerdctl/compose_config_test.go b/cmd/nerdctl/compose_config_test.go
@@ -68,7 +68,11 @@ services:
 	comp := testutil.NewComposeDir(t, fmt.Sprintf(dockerComposeYAML, "3.13"))
 	defer comp.CleanUp()
 
-	base.ComposeCmd("-f", comp.YAMLFullPath(), "config", "--hash=*").AssertOutContains("hello1")
+	// `--hash=*` is broken in Docker Compose v2.23.0: https://github.com/docker/compose/issues/11145
+	if base.Target == testutil.Nerdctl {
+		base.ComposeCmd("-f", comp.YAMLFullPath(), "config", "--hash=*").AssertOutContains("hello1")
+	}
+
 	hash := base.ComposeCmd("-f", comp.YAMLFullPath(), "config", "--hash=hello1").Out()
 
 	newComp := testutil.NewComposeDir(t, fmt.Sprintf(dockerComposeYAML, "3.14"))