From 9e7f558c1bc32492dd6659e44e690ac8b3dee478 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Wed, 28 Feb 2024 12:56:47 +0100 Subject: [PATCH] make: check if docker is using new oci save format Signed-off-by: Djalal Harouni --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 422c6e13859..a1faf8990ca 100644 --- a/Makefile +++ b/Makefile @@ -309,7 +309,9 @@ tarball: tarball-clean image $(QUIET)mkdir -p $(BUILD_PKG_DIR)/docker/ $(QUIET)mkdir -p $(BUILD_PKG_DIR)/linux-tarball/ tar xC $(BUILD_PKG_DIR)/docker/ -f $(BUILD_PKG_DIR)/tetragon-$(VERSION)-$(TARGET_ARCH).tmp.tar - find $(BUILD_PKG_DIR)/docker/ -name 'layer.tar' -exec cp '{}' $(BUILD_PKG_DIR)/linux-tarball/tetragon-$(VERSION)-$(TARGET_ARCH).tar \; + sync $(BUILD_PKG_DIR)/docker/manifest.json + cat $(BUILD_PKG_DIR)/docker/manifest.json + cp "${BUILD_PKG_DIR}/docker/$$(jq -r '.[].Layers[0]' "${BUILD_PKG_DIR}/docker/manifest.json")" ${BUILD_PKG_DIR}/linux-tarball/tetragon-$(VERSION)-$(TARGET_ARCH).tar $(QUIET)rm -fr $(BUILD_PKG_DIR)/tetragon-$(VERSION)-$(TARGET_ARCH).tmp.tar gzip -6 $(BUILD_PKG_DIR)/linux-tarball/tetragon-$(VERSION)-$(TARGET_ARCH).tar @echo "Tetragon tarball is ready: $(BUILD_PKG_DIR)/linux-tarball/tetragon-$(VERSION)-$(TARGET_ARCH).tar.gz" @@ -411,4 +413,4 @@ kind-install-tetragon: ./contrib/localdev/install-tetragon.sh --image cilium/tetragon:latest --operator cilium/tetragon-operator:latest .PHONY: kind-setup -kind-setup: images kind kind-install-tetragon \ No newline at end of file +kind-setup: images kind kind-install-tetragon