Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v16] Updating OS Package metadata: license and description #49963

Merged
merged 6 commits into from
Dec 11, 2024
+7 −3
Merged

[v16] Updating OS Package metadata: license and description #49963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26bc40c
Updating OS Package metadata: license and description
doggydogworld Dec 4, 2024
f5cdcfe
Adding community license to tarball
doggydogworld Dec 5, 2024
959918e
Updating build-package to include license for OSS package metadata
doggydogworld Dec 5, 2024
fb63b07
Fixing some interpolation errors
doggydogworld Dec 6, 2024
5cca99b
Removing unecessary line
doggydogworld Dec 6, 2024
d2f24e6
Cleaning up the metadata formatting
doggydogworld Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ build-archive: | $(RELEASE_DIR)
build.assets/install\
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
View file
Open in desktop
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="info@goteleport.com"
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
Loading