From c34699f8dd2be7d6f54458e08f4535bae5207f22 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 May 2020 16:49:52 +0200 Subject: [PATCH] CI: fix "--import-cache" deprecation warnings I noticed these warnings in CI logs; +buildctl build --progress=plain --frontend=dockerfile.v0 --opt context=git://github.com/moby/buildkit#refs/pull/1482/merge --opt build-arg:BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 --opt platform=linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,darwin/amd64,windows/amd64 --import-cache cicache.buildk.it/moby/buildkit/master:binaries-cross-helper WARN[0000] --import-cache is deprecated. Please use --import-cache type=registry,ref=,=[,=] instead. Signed-off-by: Sebastiaan van Stijn --- hack/build_ci_first_pass | 2 +- hack/cross | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/build_ci_first_pass b/hack/build_ci_first_pass index 097d2894..0e67c230 100755 --- a/hack/build_ci_first_pass +++ b/hack/build_ci_first_pass @@ -31,5 +31,5 @@ buildctl build $progressFlag --frontend=dockerfile.v0 \ buildctl build $progressFlag --frontend=dockerfile.v0 \ $currentcontextBuildctl \ --opt target=integration-tests-base \ - --import-cache cicache.buildk.it/moby/buildkit/master:integration-tests \ + --import-cache type=registry,ref=cicache.buildk.it/moby/buildkit/master:integration-tests \ $exportCacheFlags $exportFlags:integration-tests diff --git a/hack/cross b/hack/cross index e35985e7..af11d314 100755 --- a/hack/cross +++ b/hack/cross @@ -18,16 +18,16 @@ buildctl build $progressFlag --frontend=dockerfile.v0 \ $currentcontextBuildctl \ --opt target=binaries-linux-helper \ --opt platform=$RUNC_PLATFORMS \ - --import-cache cicache.buildk.it/moby/buildkit/master:binaries-cross-helper \ + --import-cache type=registry,ref=cicache.buildk.it/moby/buildkit/master:binaries-cross-helper \ --export-cache type=inline --output type=image,push=true,name=$repo:binaries-cross-helper fi buildctl build --progress=plain --frontend=dockerfile.v0 \ $currentcontextBuildctl \ --opt platform=$PLATFORMS \ - --import-cache cicache.buildk.it/moby/buildkit/master:binaries-cross-helper + --import-cache type=registry,ref=cicache.buildk.it/moby/buildkit/master:binaries-cross-helper buildctl build --progress=plain --frontend=dockerfile.v0 \ $currentcontextBuildctl \ --opt platform=windows/amd64 --opt target=buildkit-buildkitd \ - --import-cache cicache.buildk.it/moby/buildkit/master:binaries + --import-cache type=registry,ref=cicache.buildk.it/moby/buildkit/master:binaries