From 10f69d8368ca504160520464d5248050ede89275 Mon Sep 17 00:00:00 2001 From: nayihz Date: Fri, 13 Sep 2024 16:26:32 +0800 Subject: [PATCH] fix warnings when build images --- Makefile | 7 ++++--- build/Containerfile.dataplane | 2 +- build/Containerfile.udp_server | 4 ++-- tools/performance/Dockerfile | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e67407d2..3b289516 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,10 @@ # ------------------------------------------------------------------------------ # IMAGES used when running tests. -BLIXT_CONTROLPLANE_IMAGE ?= ghcr.io/kubernetes-sigs/blixt-controlplane -BLIXT_DATAPLANE_IMAGE ?= ghcr.io/kubernetes-sigs/blixt-dataplane -BLIXT_UDP_SERVER_IMAGE ?= ghcr.io/kubernetes-sigs/blixt-udp-test-server +REGISTRY ?= ghcr.io/kubernetes-sigs +BLIXT_CONTROLPLANE_IMAGE ?= $(REGISTRY)/blixt-controlplane +BLIXT_DATAPLANE_IMAGE ?= $(REGISTRY)/blixt-dataplane +BLIXT_UDP_SERVER_IMAGE ?= $(REGISTRY)/blixt-udp-test-server # Dockerfile paths for each service CONTROLPLANE_DOCKERFILE ?= build/Containerfile.controlplane diff --git a/build/Containerfile.dataplane b/build/Containerfile.dataplane index cbf1c1d7..58213b8d 100644 --- a/build/Containerfile.dataplane +++ b/build/Containerfile.dataplane @@ -1,4 +1,4 @@ -FROM rust:1.75-slim-bookworm as builder +FROM rust:1.75-slim-bookworm AS builder ARG TARGETARCH diff --git a/build/Containerfile.udp_server b/build/Containerfile.udp_server index 54292116..2f86aee4 100644 --- a/build/Containerfile.udp_server +++ b/build/Containerfile.udp_server @@ -1,4 +1,4 @@ -FROM rust as builder +FROM rust AS builder RUN apt-get update && \ apt-get install musl-tools -yq && \ @@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/workspace/target/ \ FROM alpine -LABEL org.opencontainers.image.source https://github.com/kubernetes-sigs/blixt +LABEL org.opencontainers.image.source=https://github.com/kubernetes-sigs/blixt WORKDIR / diff --git a/tools/performance/Dockerfile b/tools/performance/Dockerfile index edb967e0..7cad82b7 100644 --- a/tools/performance/Dockerfile +++ b/tools/performance/Dockerfile @@ -1,6 +1,6 @@ FROM alpine -LABEL org.opencontainers.image.source https://github.com/kubernetes-sigs/blixt +LABEL org.opencontainers.image.source=https://github.com/kubernetes-sigs/blixt RUN apk --no-cache add iperf3