From 0b977127a27810d422313436e266c0a12e2c4260 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 26 Oct 2023 12:41:21 +0000 Subject: [PATCH 1/2] Vagrantfile.freebsd: pin generic/freebsd13 to version 4.3.2 The latest version (v4.3.4) is currently broken Fix issue 2596 Carry PR 2597 (originally submitted by yankay) Co-authored-by: Kay Yan Signed-off-by: Akihiro Suda --- Vagrantfile.freebsd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vagrantfile.freebsd b/Vagrantfile.freebsd index 08db3dddc4f..1aaadf5d6d9 100644 --- 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 From 161bf2055de17ae5cd2daeeb1edc8a85ae8083d4 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 28 Oct 2023 00:30:25 +0900 Subject: [PATCH 2/2] compose_config_test: workaround for Docker Compose v2.23.0 The test for `docker compose config --hash=*` has to be temporarily skipped, as `docker compose config --hash=*` is broken in Docker Compose v2.23.0 (docker/compose issue 11145) Fix issue 2605 Signed-off-by: Akihiro Suda --- cmd/nerdctl/compose_config_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/nerdctl/compose_config_test.go b/cmd/nerdctl/compose_config_test.go index 705d467cb8f..29d371e98e4 100644 --- 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"))