Skip to content

Net 9069/fix local brokerage #3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xwa153 merged 3 commits into from
Apr 25, 2024
Merged

Net 9069/fix local brokerage #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2c50b
make copy of license file into control plane
xwa153 Apr 24, 2024
c88ea5c
remove redundant copy in gh workflow
xwa153 Apr 24, 2024
f912a6e
use env instead of arg
xwa153 Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
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
View file
Open in desktop
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