mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-02 19:47:54 +00:00
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
This commit is contained in:
5
.github/actions/build-vault/action.yml
vendored
5
.github/actions/build-vault/action.yml
vendored
@@ -137,7 +137,10 @@ runs:
|
|||||||
run: make ci-build
|
run: make ci-build
|
||||||
- if: inputs.vault-edition != 'ce'
|
- if: inputs.vault-edition != 'ce'
|
||||||
shell: bash
|
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
|
- name: Bundle Vault
|
||||||
env:
|
env:
|
||||||
BUNDLE_PATH: out/${{ steps.metadata.outputs.artifact-basename }}.zip
|
BUNDLE_PATH: out/${{ steps.metadata.outputs.artifact-basename }}.zip
|
||||||
|
|||||||
10
Makefile
10
Makefile
@@ -366,9 +366,13 @@ ci-get-version-package:
|
|||||||
ci-install-external-tools:
|
ci-install-external-tools:
|
||||||
@$(CURDIR)/scripts/ci-helper.sh install-external-tools
|
@$(CURDIR)/scripts/ci-helper.sh install-external-tools
|
||||||
|
|
||||||
.PHONY: ci-prepare-legal
|
.PHONY: ci-prepare-ent-legal
|
||||||
ci-prepare-legal:
|
ci-prepare-ent-legal:
|
||||||
@$(CURDIR)/scripts/ci-helper.sh prepare-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
|
.PHONY: ci-update-external-tool-modules
|
||||||
ci-update-external-tool-modules:
|
ci-update-external-tool-modules:
|
||||||
|
|||||||
@@ -123,8 +123,8 @@ function build() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare legal requirements for packaging
|
# ENT: Prepare legal requirements for packaging
|
||||||
function prepare_legal() {
|
function prepare_ent_legal() {
|
||||||
: "${PKG_NAME:="vault"}"
|
: "${PKG_NAME:="vault"}"
|
||||||
|
|
||||||
pushd "$(repo_root)"
|
pushd "$(repo_root)"
|
||||||
@@ -137,6 +137,21 @@ function prepare_legal() {
|
|||||||
popd
|
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
|
# Package version converts a vault version string into a compatible representation for system
|
||||||
# packages.
|
# packages.
|
||||||
function version_package() {
|
function version_package() {
|
||||||
@@ -161,8 +176,11 @@ function main() {
|
|||||||
date)
|
date)
|
||||||
build_date
|
build_date
|
||||||
;;
|
;;
|
||||||
prepare-legal)
|
prepare-ent-legal)
|
||||||
prepare_legal
|
prepare_ent_legal
|
||||||
|
;;
|
||||||
|
prepare-ce-legal)
|
||||||
|
prepare_ce_legal
|
||||||
;;
|
;;
|
||||||
revision)
|
revision)
|
||||||
build_revision
|
build_revision
|
||||||
|
|||||||
Reference in New Issue
Block a user