Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Riobo Lorenzo <ariobolo@redhat.com>
adrianriobo committed Jul 31, 2024
1 parent a35d977 commit 154df0a
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 154df0a

Please sign in to comment.