Skip to content

Backport of add missing license file into release/1.4.x #3939

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 2 commits into from
Apr 22, 2024
Merged

Backport of add missing license file into release/1.4.x #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
708d30f
backport of commit 25f85af4bf05a514a93f6e39ee6a3d2f50fbf884
xwa153 Apr 18, 2024
ed806cd
backport of commit 98a867ef6702d67ff162298a7f02abf3da489254
xwa153 Apr 19, 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
12 changes: 12 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ jobs:
working-directory: ${{ matrix.component }}
run: |
mkdir -p dist out
cp LICENSE dist/LICENSE.txt

export GIT_COMMIT=$(git rev-parse --short HEAD)
export GIT_DIRTY=$(test -n "$(git status --porcelain)" && echo "+CHANGES")
Expand All @@ -160,6 +161,13 @@ jobs:
name: ${{ matrix.pkg_name }}_${{ needs.get-product-version.outputs.product-version }}${{ matrix.fips }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip
path: ${{ matrix.component}}/out/${{ matrix.pkg_name }}_${{ needs.get-product-version.outputs.product-version }}${{ matrix.fips }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip

- name: Copy license file
env:
LICENSE_DIR: ".release/linux/package/usr/share/doc/${{ env.PKG_NAME }}"
run: |
mkdir -p "$LICENSE_DIR"
cp LICENSE "$LICENSE_DIR/LICENSE.txt"

- name: Package rpm and deb files
if: matrix.goos == 'linux' && matrix.component == 'cli' && matrix.skip_packaging != 'true'
uses: hashicorp/actions-packaging-linux@v1
Expand All @@ -174,6 +182,7 @@ jobs:
binary: "${{ matrix.component }}/dist/${{ matrix.pkg_name }}"
deb_depends: "openssl"
rpm_depends: "openssl"
config_dir: ".release/linux/package/"

- name: Set package names
if: matrix.goos == 'linux' && matrix.component == 'cli' && matrix.skip_packaging != 'true'
Expand Down Expand Up @@ -263,6 +272,9 @@ 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
18 changes: 15 additions & 3 deletions control-plane/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ LABEL name=${BIN_NAME} \
version=${VERSION} \
release=${VERSION} \
summary="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes."
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
org.opencontainers.image.licenses="MPL-2.0"

RUN mkdir -p /usr/share/doc/$PRODUCT_NAME
COPY LICENSE /usr/share/doc/$PRODUCT_NAME/LICENSE.txt

# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
ENV BIN_NAME=${BIN_NAME}
Expand Down Expand Up @@ -87,7 +91,11 @@ LABEL name=${BIN_NAME} \
version=${PRODUCT_VERSION} \
release=${PRODUCT_VERSION} \
summary="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes."
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
org.opencontainers.image.licenses="MPL-2.0"

RUN mkdir -p /usr/share/doc/$PRODUCT_NAME
COPY LICENSE /usr/share/doc/$PRODUCT_NAME/LICENSE.txt

# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
ENV BIN_NAME=${BIN_NAME}
Expand Down Expand Up @@ -150,7 +158,11 @@ LABEL name=$PRODUCT_NAME \
version=$PRODUCT_VERSION \
release=$PRODUCT_VERSION \
summary="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes."
description="consul-k8s-control-plane provides first-class integrations between Consul and Kubernetes." \
org.opencontainers.image.licenses="MPL-2.0"

RUN mkdir -p /usr/share/doc/$PRODUCT_NAME
COPY LICENSE /usr/share/doc/$PRODUCT_NAME/LICENSE.txt

# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
ENV NAME=${BIN_NAME}
Expand Down