From 068d7e085b3cbc0078afb67315852f6a2100cd24 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Jun 2022 10:39:53 +0200 Subject: [PATCH] Use ubi8 base image for centos8 Signed-off-by: Evan Lezar --- build/container/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build/container/Makefile b/build/container/Makefile index 7a1186e7..3b523954 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -110,10 +110,15 @@ build-ubi8: DOCKERFILE_SUFFIX := centos build-ubi8: PACKAGE_DIST = centos8 build-ubi8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) -build-centos%: BASE_DIST = $(*) -build-centos%: DOCKERFILE_SUFFIX := centos -build-centos%: PACKAGE_DIST = $(BASE_DIST) -build-centos%: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) +build-centos7: BASE_DIST = $(*) +build-centos7: DOCKERFILE_SUFFIX := centos +build-centos7: PACKAGE_DIST = $(BASE_DIST) +build-centos7: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) + +build-centos8: BASE_DIST := ubi8 +build-centos8: DOCKERFILE_SUFFIX := centos +build-centos8: PACKAGE_DIST = centos8 +build-centos8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) build-packaging: BASE_DIST := ubuntu20.04 build-packaging: DOCKERFILE_SUFFIX := packaging