From b8005a8f17351fde7d4c89f052adfe17045842a6 Mon Sep 17 00:00:00 2001 From: Martin Zihlmann Date: Mon, 26 May 2025 23:38:48 +0100 Subject: [PATCH 1/2] allow flexible args overrides --- integration/images.go | 2 ++ integration/integration_test.go | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/integration/images.go b/integration/images.go index 4368291ec..8fab649f7 100644 --- a/integration/images.go +++ b/integration/images.go @@ -87,6 +87,8 @@ var additionalKanikoFlagsMap = map[string][]string{ "Dockerfile_test_maintainer": {"--single-snapshot"}, "Dockerfile_test_target": {"--target=second"}, "Dockerfile_test_snapshotter_ignorelist": {"--use-new-run=true", "-v=trace"}, + "Dockerfile_test_cache_copy": {"--cache-copy-layers=true"}, + "Dockerfile_test_cache_copy_oci": {"--cache-copy-layers=true"}, } // output check to do when building with kaniko diff --git a/integration/integration_test.go b/integration/integration_test.go index 9a147d7f6..0a6e6b5f2 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -722,9 +722,9 @@ func TestWarmerTwice(t *testing.T) { } func verifyBuildWith(t *testing.T, cache, dockerfile string) { - args := []string{} - if strings.HasPrefix(dockerfile, "Dockerfile_test_cache_copy") { - args = append(args, "--cache-copy-layers=true") + args, ok := additionalKanikoFlagsMap[dockerfile] + if !ok { + args = []string{} } // Build the initial image which will cache layers From ac6ccd1513dabf91e53b9187687801661bc67961 Mon Sep 17 00:00:00 2001 From: Martin Zihlmann Date: Mon, 26 May 2025 23:41:24 +0100 Subject: [PATCH 2/2] use args overrides to minimize diff --- integration/dockerfiles/Dockerfile_test_cache | 2 ++ integration/dockerfiles/Dockerfile_test_cache_install | 1 + integration/dockerfiles/Dockerfile_test_cache_install_oci | 1 + integration/dockerfiles/Dockerfile_test_cache_oci | 2 ++ integration/images.go | 4 ++++ 5 files changed, 10 insertions(+) diff --git a/integration/dockerfiles/Dockerfile_test_cache b/integration/dockerfiles/Dockerfile_test_cache index 0f80fbf21..92e85f9f3 100644 --- a/integration/dockerfiles/Dockerfile_test_cache +++ b/integration/dockerfiles/Dockerfile_test_cache @@ -18,3 +18,5 @@ FROM debian:10.13 RUN date > /date +COPY context/foo /foo +# RUN echo hey diff --git a/integration/dockerfiles/Dockerfile_test_cache_install b/integration/dockerfiles/Dockerfile_test_cache_install index 5d044833d..5a79fe1b4 100644 --- a/integration/dockerfiles/Dockerfile_test_cache_install +++ b/integration/dockerfiles/Dockerfile_test_cache_install @@ -20,4 +20,5 @@ FROM debian:10.13 RUN mkdir /foo WORKDIR /foo RUN apt-get update && apt-get install -y make +COPY context/bar /context RUN echo "hey" > foo diff --git a/integration/dockerfiles/Dockerfile_test_cache_install_oci b/integration/dockerfiles/Dockerfile_test_cache_install_oci index 5d044833d..5a79fe1b4 100644 --- a/integration/dockerfiles/Dockerfile_test_cache_install_oci +++ b/integration/dockerfiles/Dockerfile_test_cache_install_oci @@ -20,4 +20,5 @@ FROM debian:10.13 RUN mkdir /foo WORKDIR /foo RUN apt-get update && apt-get install -y make +COPY context/bar /context RUN echo "hey" > foo diff --git a/integration/dockerfiles/Dockerfile_test_cache_oci b/integration/dockerfiles/Dockerfile_test_cache_oci index 0f80fbf21..92e85f9f3 100644 --- a/integration/dockerfiles/Dockerfile_test_cache_oci +++ b/integration/dockerfiles/Dockerfile_test_cache_oci @@ -18,3 +18,5 @@ FROM debian:10.13 RUN date > /date +COPY context/foo /foo +# RUN echo hey diff --git a/integration/images.go b/integration/images.go index 8fab649f7..170f658af 100644 --- a/integration/images.go +++ b/integration/images.go @@ -87,6 +87,10 @@ var additionalKanikoFlagsMap = map[string][]string{ "Dockerfile_test_maintainer": {"--single-snapshot"}, "Dockerfile_test_target": {"--target=second"}, "Dockerfile_test_snapshotter_ignorelist": {"--use-new-run=true", "-v=trace"}, + "Dockerfile_test_cache": {"--cache-copy-layers=true"}, + "Dockerfile_test_cache_oci": {"--cache-copy-layers=true"}, + "Dockerfile_test_cache_install": {"--cache-copy-layers=true"}, + "Dockerfile_test_cache_install_oci": {"--cache-copy-layers=true"}, "Dockerfile_test_cache_copy": {"--cache-copy-layers=true"}, "Dockerfile_test_cache_copy_oci": {"--cache-copy-layers=true"}, }