Skip to content

Commit

Permalink
Merge pull request #191 from orelmisan/checkup-base-image
Browse files Browse the repository at this point in the history
Makefile: Set the tag of the checukp's base image
  • Loading branch information
orelmisan authored Sep 4, 2023
2 parents 66fcdac + a732328 commit 0046d90
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ORG ?= kiagnose
CHECKUP_IMAGE_NAME ?= kubevirt-dpdk-checkup
CHECKUP_IMAGE_TAG ?= latest
CHECKUP_GIT_TAG ?= $(shell git describe --always --abbrev=8 --tags)
CHECKUP_BASE_IMAGE_TAG ?= 9.2-717
VM_IMAGE_BUILDER_IMAGE_NAME := kubevirt-dpdk-checkup-vm-image-builder
VM_IMAGE_BUILDER_IMAGE_TAG ?= latest
VIRT_BUILDER_CACHE_DIR := $(CURDIR)/_virt_builder/cache
Expand All @@ -15,7 +16,6 @@ GO_IMAGE_NAME := docker.io/library/golang
GO_IMAGE_TAG := 1.20.6
BIN_DIR = $(CURDIR)/_output/bin
CRI_BIN ?= $(shell hack/detect_cri.sh)
CRI_BUILD_BASE_IMAGE_TAG ?= latest
LINTER_IMAGE_NAME := docker.io/golangci/golangci-lint
LINTER_IMAGE_TAG := v1.50.1
GO_MOD_VERSION=$(shell hack/go-mod-version.sh)
Expand All @@ -37,7 +37,7 @@ build:
-e GOOS=linux \
-e GOARCH=amd64 \
$(GO_IMAGE_NAME):$(GO_IMAGE_TAG) go build -v -o $(BIN_DIR)/$(CHECKUP_IMAGE_NAME) ./cmd/
$(CRI_BIN) build --build-arg BASE_IMAGE_TAG=$(CRI_BUILD_BASE_IMAGE_TAG) . -t $(REG)/$(ORG)/$(CHECKUP_IMAGE_NAME):$(CHECKUP_IMAGE_TAG)
$(CRI_BIN) build --build-arg BASE_IMAGE_TAG=$(CHECKUP_BASE_IMAGE_TAG) . -t $(REG)/$(ORG)/$(CHECKUP_IMAGE_NAME):$(CHECKUP_IMAGE_TAG)
.PHONY: build

push:
Expand Down

0 comments on commit 0046d90

Please sign in to comment.