diff --git a/core/src/plugins/container/build.ts b/core/src/plugins/container/build.ts index 63d17753f1..a65a9872e1 100644 --- a/core/src/plugins/container/build.ts +++ b/core/src/plugins/container/build.ts @@ -192,7 +192,7 @@ async function buildContainerLocally({ Your local docker daemon does not support building multi-platform images. If you are using Docker Desktop, you can turn on the experimental containerd image store. To build multi-platform images locally with other local docker platforms, - you can add custom docker-container buildx builder. + you can add a custom buildx builder of type docker-container. Learn more at https://docs.docker.com/go/build-multi-platform/ `, }) diff --git a/core/test/integ/src/plugins/container/container.ts b/core/test/integ/src/plugins/container/container.ts index 9f6ebeb02d..7965dfca29 100644 --- a/core/test/integ/src/plugins/container/container.ts +++ b/core/test/integ/src/plugins/container/container.ts @@ -312,6 +312,7 @@ describe("plugins.container", () => { expect(args.slice(2, 4)).to.eql(["--build-arg", `GARDEN_ACTION_VERSION=${buildAction.versionString()}`]) }) }) + describe("multiPlatformBuilds", () => { it("should include platform flags", async () => { const config = cloneDeep(baseConfig) @@ -327,23 +328,5 @@ describe("plugins.container", () => { const args = getDockerBuildFlags(resolvedBuild, ctx.provider.config) expect(args.slice(-4)).to.eql(["--platform", "linux/amd64", "--platform", "linux/arm64"]) }) - - it("should set GARDEN_ACTION_VERSION", async () => { - const config = cloneDeep(baseConfig) - - const buildAction = await getTestBuild(config) - - const resolvedBuild = await garden.resolveAction({ - action: buildAction, - log, - graph: await garden.getConfigGraph({ log, emit: false }), - }) - - const args = getDockerBuildFlags(resolvedBuild, ctx.provider.config) - - // Also module version is set for backwards compatability - expect(args.slice(0, 2)).to.eql(["--build-arg", `GARDEN_MODULE_VERSION=${buildAction.versionString()}`]) - expect(args.slice(2, 4)).to.eql(["--build-arg", `GARDEN_ACTION_VERSION=${buildAction.versionString()}`]) - }) }) })