From 23eb3042c78d6359cd721183bd6665903462132a Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Tue, 26 Dec 2023 15:11:13 +0800 Subject: [PATCH] kata-monitor: fix Dockerfile to build image move `SKIP_GO_VERSION_CHECK` after `make` command to skip checking golang version. And also upgrade golang to 1.19. Fixes: #8728 Signed-off-by: Bin Liu --- tools/packaging/kata-monitor/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/packaging/kata-monitor/Dockerfile b/tools/packaging/kata-monitor/Dockerfile index 513f666bb..70cd9a528 100644 --- a/tools/packaging/kata-monitor/Dockerfile +++ b/tools/packaging/kata-monitor/Dockerfile @@ -1,12 +1,12 @@ # Copyright (c) 2020 Eric Ernst # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.15-alpine AS builder +FROM golang:1.19-alpine AS builder -RUN apk add --no-cache bash curl git make +RUN apk add --no-cache bash curl git make build-base WORKDIR /go/src/github.com/kata-containers/kata-containers/src/runtime COPY . /go/src/github.com/kata-containers/kata-containers -RUN SKIP_GO_VERSION_CHECK=true make monitor +RUN make SKIP_GO_VERSION_CHECK=true monitor FROM alpine:3.14 COPY --from=builder /go/src/github.com/kata-containers/kata-containers/src/runtime/kata-monitor /usr/bin/kata-monitor