From c83fae712322e775058cffa4afd859c8d4bbbbf6 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:59:45 -0400 Subject: [PATCH] move definition --- Makefile.inputs | 2 +- container/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.inputs b/Makefile.inputs index 240a8fb..a77e4f2 100644 --- a/Makefile.inputs +++ b/Makefile.inputs @@ -6,7 +6,7 @@ export ARCH := x86_64 export EXTRA_BOOT_PARAMS := export IMAGE_NAME := base export IMAGE_REPO := quay.io/fedora-ostree-desktops -export IMAGE_SRC = docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) +export IMAGE_SRC := export IMAGE_TAG = $(VERSION) export IMAGE_SIGNED := true REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) diff --git a/container/Makefile b/container/Makefile index c4467af..c9f7c4a 100644 --- a/container/Makefile +++ b/container/Makefile @@ -1,3 +1,7 @@ +ifeq ($(IMAGE_SRC),) +IMAGE_SRC := docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) +endif + $(IMAGE_NAME)-$(IMAGE_TAG): skopeo copy $(IMAGE_SRC) oci:$(IMAGE_NAME)-$(IMAGE_TAG)