From 154df0a2970c489a72a374ad1c775dfb8b829a9f Mon Sep 17 00:00:00 2001 From: Adrian Riobo Lorenzo Date: Wed, 31 Jul 2024 18:20:07 +0200 Subject: [PATCH] test Signed-off-by: Adrian Riobo Lorenzo --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4095c59..4bda133 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,9 @@ include tools/tools.mk # Registries and versions SNC_RUNNER ?= $(shell sed -n 1p snc-runner/release-info) -SNC_RUNNER_V ?= $(shell sed -n 2p snc-runner/release-info) +SNC_RUNNER_V ?= v$(shell sed -n 2p snc-runner/release-info) CRC_BUILDER ?= $(shell sed -n 1p crc-builder/release-info) -CRC_BUILDER_V ?= $(shell sed -n 2p crc-builder/release-info) +CRC_BUILDER_V ?= v$(shell sed -n 2p crc-builder/release-info) .PHONY: build-snc-runner-oci build-crc-builder-oci @@ -20,9 +20,8 @@ CRC_BUILDER_V ?= $(shell sed -n 2p crc-builder/release-info) tkn_creator = sed -e 's%cimage%$(1)%g' -e 's%cversion%$(2)%g' $(3)/tkn/tpl/task.tpl.yaml > $(3)/tkn/task.yaml tkn_pusher = $(TOOLS_BINDIR)/tkn bundle push $(1):$(2)-tkn -f $(3)/tkn/task.yaml -build-snc-runner-oci: -CONTEXT=snc-runner/oci -MANIFEST=$(SNC_RUNNER):$(SNC_RUNNER_V) +build-snc-runner-oci: CONTEXT=snc-runner/oci +build-snc-runner-oci: MANIFEST=$(SNC_RUNNER):$(SNC_RUNNER_V) build-snc-runner-oci: ${CONTAINER_MANAGER} build -t $(MANIFEST) -f $(CONTEXT)/Containerfile $(CONTEXT) @@ -33,8 +32,8 @@ build-crc-builder-oci: # ifndef CRC_BUILDER_V # CRC_BUILDER_V=v$(shell sed -n 2p crc-builder/release-info) # endif -CONTEXT=crc-builder/oci -MANIFEST=$(CRC_BUILDER):$(CRC_BUILDER_V) +build-crc-builder-oci: CONTEXT=crc-builder/oci +build-crc-builder-oci: MANIFEST=$(CRC_BUILDER):$(CRC_BUILDER_V) build-crc-builder-oci: ${CONTAINER_MANAGER} manifest create $(MANIFEST)-linux ${CONTAINER_MANAGER} build --platform linux/arm64 --build-arg=TARGETARCH=arm64 --manifest $(MANIFEST)-linux -f $(CONTEXT)/Containerfile.linux $(CONTEXT)