From 1e166b7d48355d613f8cba416adfc6484127b1ee Mon Sep 17 00:00:00 2001
From: wangxinyi7 <xinyi.wang@hashicorp.com>
Date: Wed, 24 Apr 2024 22:50:33 -0700
Subject: [PATCH] Net 9069/add license backport 1.2.x (#3950)

* add missing license file (#3921)

* add missing license file

* missed copying the license file to workdir

* make up missing value and remove redundant directory creation

* Net 9069/xw add license file to all bin (#3942)

* debug: missing LICENSE

* use abs path

* use env instead of arg
---
 .github/workflows/build.yml | 14 +++++++++++++-
 control-plane/Dockerfile    | 20 +++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c46435c42..1c0174ca40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -145,6 +145,7 @@ jobs:
         working-directory: ${{ matrix.component }}
         run: |
           mkdir -p dist out
+          cp $GITHUB_WORKSPACE/LICENSE dist/LICENSE.txt
 
           export GIT_COMMIT=$(git rev-parse --short HEAD)
           export GIT_DIRTY=$(test -n "$(git status --porcelain)" && echo "+CHANGES")
@@ -159,7 +160,14 @@ jobs:
         with:
           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 $GITHUB_WORKSPACE/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
@@ -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'
@@ -263,6 +272,9 @@ 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
diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile
index b1752507fd..12897aef31 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>" \
@@ -39,7 +40,10 @@ 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"
+
+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}
@@ -80,6 +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
+ENV PRODUCT_NAME=$BIN_NAME
 
 LABEL name=${BIN_NAME} \
       maintainer="Team Consul Kubernetes <team-consul-kubernetes@hashicorp.com>" \
@@ -87,7 +92,10 @@ 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"
+
+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}
@@ -141,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>" \
@@ -150,7 +157,10 @@ 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"
+
+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}