From c42387d7eeb8010f4d155f5ba70a7e56438740a8 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 19 Oct 2021 21:31:46 +0200
Subject: [PATCH] makefile: switch to cgroupsv2-aware kaniko build

as a consequence, we no longer need to override using "--force".
works with both recent podman and docker (>=v20.x)

[skip ci]
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2c124cc..87a8aca 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ dargs = build -t $(dtag) --no-cache --pull - < $(dfile)
 cleanargs = image rm -f $(dtag)
 pruneargs = system prune -af
 dargskaniko = run --rm -it -w=$(kanikowdir) -v $$PWD:$(kanikowdir)
-kanikoexecutorimg = gcr.io/kaniko-project/executor:debug
+kanikoexecutorimg = gcr.io/kaniko-project/executor@sha256:6ecc43ae139ad8cfa11604b592aaedddcabff8cef469eda303f1fb5afe5e3034
 kanikowdir = /src
 kanikocontext = .
-kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --no-push --force
+kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --no-push
 hadolintimg = hadolint/hadolint:v1.23.0-8-gb01c5a9-alpine
 hadolintargs = run --rm -i -v $$PWD/.hadolint.yaml:/root/.config/hadolint.yaml