From db388a5ecd9512ca97ae05f0ab8a11a30f6b5a11 Mon Sep 17 00:00:00 2001 From: Bianca Moreira <48203644+biazmoreira@users.noreply.github.com> Date: Fri, 17 May 2024 17:18:38 +0200 Subject: [PATCH] legal: include license in release zip and docker image (#26801) * legal: include license in release zip and docker image * Move license logic to script * Add cp license to build vault action * test * Trigger Build --- .github/actions/build-vault/action.yml | 5 ++++- Makefile | 10 +++++++--- scripts/ci-helper.sh | 26 ++++++++++++++++++++++---- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.github/actions/build-vault/action.yml b/.github/actions/build-vault/action.yml index 4c34f34a23..8fc228415a 100644 --- a/.github/actions/build-vault/action.yml +++ b/.github/actions/build-vault/action.yml @@ -137,7 +137,10 @@ runs: run: make ci-build - if: inputs.vault-edition != 'ce' shell: bash - run: make ci-prepare-legal + run: make ci-prepare-ent-legal + - if: inputs.vault-edition == 'ce' + shell: bash + run: make ci-prepare-ce-legal - name: Bundle Vault env: BUNDLE_PATH: out/${{ steps.metadata.outputs.artifact-basename }}.zip diff --git a/Makefile b/Makefile index 4465770692..d3443a0e8b 100644 --- a/Makefile +++ b/Makefile @@ -366,9 +366,13 @@ ci-get-version-package: ci-install-external-tools: @$(CURDIR)/scripts/ci-helper.sh install-external-tools -.PHONY: ci-prepare-legal -ci-prepare-legal: - @$(CURDIR)/scripts/ci-helper.sh prepare-legal +.PHONY: ci-prepare-ent-legal +ci-prepare-ent-legal: + @$(CURDIR)/scripts/ci-helper.sh prepare-ent-legal + +.PHONY: ci-prepare-ce-legal +ci-prepare-ce-legal: + @$(CURDIR)/scripts/ci-helper.sh prepare-ce-legal .PHONY: ci-update-external-tool-modules ci-update-external-tool-modules: diff --git a/scripts/ci-helper.sh b/scripts/ci-helper.sh index a87ba43054..856a4391e3 100755 --- a/scripts/ci-helper.sh +++ b/scripts/ci-helper.sh @@ -123,8 +123,8 @@ function build() { popd } -# Prepare legal requirements for packaging -function prepare_legal() { +# ENT: Prepare legal requirements for packaging +function prepare_ent_legal() { : "${PKG_NAME:="vault"}" pushd "$(repo_root)" @@ -137,6 +137,21 @@ function prepare_legal() { popd } +# CE: Prepare legal requirements for packaging +function prepare_ce_legal() { + : "${PKG_NAME:="vault"}" + + pushd "$(repo_root)" + + mkdir -p dist + cp LICENSE dist/LICENSE.txt + + mkdir -p ".release/linux/package/usr/share/doc/$PKG_NAME" + cp LICENSE ".release/linux/package/usr/share/doc/$PKG_NAME/LICENSE.txt" + + popd +} + # Package version converts a vault version string into a compatible representation for system # packages. function version_package() { @@ -161,8 +176,11 @@ function main() { date) build_date ;; - prepare-legal) - prepare_legal + prepare-ent-legal) + prepare_ent_legal + ;; + prepare-ce-legal) + prepare_ce_legal ;; revision) build_revision