From 5acc4cb9f3fa622261f7d20db1d14f627dd33b72 Mon Sep 17 00:00:00 2001 From: wangxinyi7 <xinyi.wang@hashicorp.com> Date: Fri, 23 Aug 2024 10:29:41 -0700 Subject: [PATCH] make missing changes in the backport (#4260) make the LICENSE file meet compliance requirement --- control-plane/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 26f4b90ef0..f5d8349375 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -32,6 +32,7 @@ ARG CNI_BIN_NAME=consul-cni ARG VERSION ARG TARGETARCH ARG TARGETOS +ENV PRODUCT_NAME=$BIN_NAME LABEL name=${BIN_NAME} \ maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \ @@ -84,6 +85,7 @@ FROM alpine:3.19 AS release-default ARG BIN_NAME=consul-k8s-control-plane ARG CNI_BIN_NAME=consul-cni ARG PRODUCT_VERSION +ENV PRODUCT_NAME=$BIN_NAME LABEL name=${BIN_NAME} \ maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \ @@ -149,8 +151,7 @@ ARG VERSION # and the version to download. Example: PRODUCT_NAME=consul PRODUCT_VERSION=1.2.3. ENV BIN_NAME=$BIN_NAME ENV PRODUCT_VERSION=$PRODUCT_VERSION - -ARG PRODUCT_NAME=$BIN_NAME +ENV PRODUCT_NAME=$BIN_NAME LABEL name=$PRODUCT_NAME \ maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \