backport of commit 25f85af

hashicorp · Apr 18, 2024 · e18c782 · e18c782
1 parent f702da0
commit e18c782
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -144,6 +144,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")
@@ -159,6 +160,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
@@ -173,6 +181,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'

diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile
@@ -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}
@@ -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}
@@ -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}