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

[v15] [buddy] Fix: jq has been missing in the installer scripts #39599

Merged
merged 1 commit into from
Mar 19, 2024
+6 −7
Merged

[v15] [buddy] Fix: jq has been missing in the installer scripts #39599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions api/types/installers/agentless-installer.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ install_teleport() {
fi
else
# no automatic upgrades
sudo apt-get install -y "$TELEPORT_PACKAGE"
sudo apt-get install -y "$TELEPORT_PACKAGE" jq
fi

elif [ "$ID" = "amzn" ] || [ "$ID" = "rhel" ]; then
Expand All @@ -166,7 +166,7 @@ install_teleport() {
fi
else
# no automatic upgrades
sudo yum install -y "$TELEPORT_PACKAGE"
sudo yum install -y "$TELEPORT_PACKAGE" jq
fi

elif [ "$ID" = "sles" ] || [ "$ID" = "opensuse-tumbleweed" ] || [ "$ID" = "opensuse-leap" ]; then
Expand All @@ -193,7 +193,7 @@ install_teleport() {
fi
else
# no automatic upgrades
sudo zypper --non-interactive install -y "$TELEPORT_PACKAGE"
sudo zypper --non-interactive install -y "$TELEPORT_PACKAGE" jq
fi
else
echo "Unsupported distro: $ID"
Expand Down
7 changes: 3 additions & 4 deletions api/types/installers/installer.sh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ on_gcp() {
fi
else
# no automatic upgrades
sudo apt-get install -y "$TELEPORT_PACKAGE"
sudo apt-get install -y "$TELEPORT_PACKAGE" jq
fi

elif [ "$ID" = "amzn" ] || [ "$ID" = "rhel" ]; then
Expand All @@ -113,7 +113,7 @@ on_gcp() {
fi
else
# no automatic upgrades
sudo yum install -y "$TELEPORT_PACKAGE"
sudo yum install -y "$TELEPORT_PACKAGE" jq
fi

elif [ "$ID" = "sles" ] || [ "$ID" = "opensuse-tumbleweed" ] || [ "$ID" = "opensuse-leap" ]; then
Expand All @@ -125,7 +125,6 @@ on_gcp() {
sudo rpm --import "https://zypper.releases.teleport.dev/gpg"
sudo zypper --non-interactive addrepo "$(rpm --eval "https://zypper.releases.teleport.dev/sles/$VERSION_ID/Teleport/%{_arch}/{{ .RepoChannel }}/teleport.repo")"
sudo zypper --gpg-auto-import-keys refresh
sudo zypper --non-interactive install ${PACKAGE_LIST}

# shellcheck disable=SC2050
if [ "{{ .AutomaticUpgrades }}" = "true" ]; then
Expand All @@ -142,7 +141,7 @@ on_gcp() {
fi
else
# no automatic upgrades
sudo zypper --non-interactive install -y "$TELEPORT_PACKAGE"
sudo zypper --non-interactive install -y "$TELEPORT_PACKAGE" jq
fi
else
echo "Unsupported distro: $ID"
Expand Down
Loading