From defae740b9e392eab034ef7bec09a308131ac854 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Mar 31 2022 15:18:20 +0000 Subject: FEDORA_VERSION build argument --- diff --git a/images/resultsdb-backend/Dockerfile b/images/resultsdb-backend/Dockerfile index 01837be..fb56b5e 100644 --- a/images/resultsdb-backend/Dockerfile +++ b/images/resultsdb-backend/Dockerfile @@ -1,4 +1,6 @@ -FROM quay.io/fedora/fedora:35 +ARG FEDORA_VERSION + +FROM quay.io/fedora/fedora:${FEDORA_VERSION} LABEL \ name="ResultsDB Service" \ diff --git a/images/resultsdb-backend/Makefile b/images/resultsdb-backend/Makefile index 0665b95..f75af81 100644 --- a/images/resultsdb-backend/Makefile +++ b/images/resultsdb-backend/Makefile @@ -1,4 +1,5 @@ SHELL := /bin/bash +FEDORA_VERSION := 35 REG := quay.io ORG := fedora-kube-sig NAME := resultsdb-backend @@ -7,7 +8,7 @@ IMAGE := ${REG}/${ORG}/${NAME}:${TAG} CRI := podman image/build: - @${CRI} build -t ${IMAGE} . + @${CRI} build -t ${IMAGE} --build-arg FEDORA_VERSION=${FEDORA_VERSION} . image/push: image/build @${CRI} push ${IMAGE} diff --git a/images/resultsdb-frontend/Dockerfile b/images/resultsdb-frontend/Dockerfile index fd7264a..a6455cc 100644 --- a/images/resultsdb-frontend/Dockerfile +++ b/images/resultsdb-frontend/Dockerfile @@ -1,4 +1,6 @@ -FROM quay.io/fedora/fedora:35 +ARG FEDORA_VERSION + +FROM quay.io/fedora/fedora:${FEDORA_VERSION} LABEL \ name="ResultsDB Frontend Service" \ diff --git a/images/resultsdb-frontend/Makefile b/images/resultsdb-frontend/Makefile index 3e584d1..e63e024 100644 --- a/images/resultsdb-frontend/Makefile +++ b/images/resultsdb-frontend/Makefile @@ -1,4 +1,5 @@ SHELL := /bin/bash +FEDORA_VERSION := 35 REG := quay.io ORG := fedora-kube-sig NAME := resultsdb-frontend @@ -7,7 +8,7 @@ IMAGE := ${REG}/${ORG}/${NAME}:${TAG} CRI := podman image/build: - @${CRI} build -t ${IMAGE} . + @${CRI} build -t ${IMAGE} --build-arg FEDORA_VERSION=${FEDORA_VERSION} . image/push: image/build @${CRI} push ${IMAGE}