Skip to content

Commit

Permalink
[v17] Updating OS Package metadata: license and description (#49962)
Browse files Browse the repository at this point in the history
* Updating OS Package metadata: license and description

* Adding community license to tarball

* Updating build-package to include license for OSS package metadata

* Fixing some interpolation errors

* Removing unecessary line

* Cleaning up the metadata formatting
  • Loading branch information
doggydogworld authored Dec 11, 2024
1 parent 1518c2e commit 8c18de3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ build-archive: | $(RELEASE_DIR)
"$(INSTALL_SCRIPT)" \
README.md \
CHANGELOG.md \
build.assets/LICENSE-community \
teleport/
echo $(GITTAG) > teleport/VERSION
tar $(TAR_FLAGS) -c teleport | gzip -n > $(RELEASE).tar.gz
Expand Down
9 changes: 6 additions & 3 deletions build.assets/build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ FPM_IMAGE_RPM="public.ecr.aws/gravitational/fpm:centos8-1.15.1-1"

# extra package information for linux
MAINTAINER="[email protected]"
LICENSE="Apache-2.0"
LICENSE="Teleport Community Edition License"
VENDOR="Gravitational"
DESCRIPTION="Teleport is a gateway for managing access to clusters of Linux servers via SSH or the Kubernetes API"
DESCRIPTION="Teleport provides on-demand, least-privileged access to your infrastructure, on a foundation of cryptographic identity and zero trust, with built-in identity and policy governance"
DOCS_URL="https://goteleport.com/docs"

# check that curl is installed
Expand Down Expand Up @@ -194,6 +194,7 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
else
TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]"
fi
LICENSE_STANZA=()
else
TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
TAR_PATH="teleport"
Expand All @@ -204,6 +205,8 @@ else
else
TYPE_DESCRIPTION="[${TEXT_ARCH} Open source edition]"
fi
TYPE_DESCRIPTION="${TYPE_DESCRIPTION} Distributed under the ${LICENSE}"
LICENSE_STANZA=(--license "${LICENSE}")
fi

# set file list
Expand Down Expand Up @@ -359,7 +362,6 @@ else
--version "${TELEPORT_VERSION}" \
--maintainer "${MAINTAINER}" \
--url "${DOCS_URL}" \
--license "${LICENSE}" \
--vendor "${VENDOR}" \
--description "${DESCRIPTION} ${TYPE_DESCRIPTION}" \
--architecture ${PACKAGE_ARCH} \
Expand All @@ -372,6 +374,7 @@ else
--after-upgrade /src/post-upgrade \
${CONFIG_FILE_STANZA} \
${FILE_PERMISSIONS_STANZA} \
"${LICENSE_STANZA[@]}" \
${RPM_SIGN_STANZA} .

# copy created package back to current directory
Expand Down

0 comments on commit 8c18de3

Please sign in to comment.