Skip to content

Commit

Permalink
Net 9069/fix local brokerage (#3948)
Browse files Browse the repository at this point in the history
* make copy of license file into control plane

* remove redundant copy in gh workflow

* use env instead of arg
  • Loading branch information
wangxinyi7 committed Apr 25, 2024
1 parent 94ee36e commit 7754ea6
Show file tree
Hide file tree
Showing 3 changed files with 358 additions and 10 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,6 @@ jobs:
run: |
cd "${ZIP_LOCATION}"
unzip -j *.zip
- name: Copy LICENSE
run:
cp $GITHUB_WORKSPACE/LICENSE $GITHUB_WORKSPACE/control-plane
# This naming convention will be used ONLY for per-commit dev images
- name: Set docker dev tag
Expand Down Expand Up @@ -364,9 +361,6 @@ jobs:
run: |
cd "${ZIP_LOCATION}"
unzip -j *.zip
- name: Copy LICENSE
run:
cp LICENSE ./control-plane
# This naming convention will be used ONLY for per-commit dev images
- name: Set docker dev tag
Expand Down
7 changes: 3 additions & 4 deletions control-plane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ARG CNI_BIN_NAME=consul-cni
ARG VERSION
ARG TARGETARCH
ARG TARGETOS
ARG PRODUCT_NAME=$BIN_NAME
ENV PRODUCT_NAME=$BIN_NAME

LABEL name=${BIN_NAME} \
maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \
Expand Down Expand Up @@ -84,7 +84,7 @@ FROM alpine:3.18 AS release-default
ARG BIN_NAME=consul-k8s-control-plane
ARG CNI_BIN_NAME=consul-cni
ARG PRODUCT_VERSION
ARG PRODUCT_NAME=$BIN_NAME
ENV PRODUCT_NAME=$BIN_NAME

LABEL name=${BIN_NAME} \
maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \
Expand Down Expand Up @@ -149,8 +149,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>" \
Expand Down
Loading

0 comments on commit 7754ea6

Please sign in to comment.