From a46daf23002f0e8e6bcf1ff4c6d5b4bbc4eafe69 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 29 Jun 2022 09:41:08 -0400 Subject: [PATCH] Drop unused debian packages (#45173) * apt-transport-https is no longer needed (apt has builtin HTTPS support) apt-transport-https is a virtual package since Ubuntu Bionic as apt natively supports HTTPS repos since then, see: https://packages.ubuntu.com/bionic/apt-transport-https Signed-off-by: Simon Deziel * Stop pulling software-properties-common (unused) software-properties-common was used for the add-apt-repository command that is no longer used since commit 26cf3d9c66d8f1 Signed-off-by: Simon Deziel --- docs/sources/setup-grafana/installation/debian.md | 5 +---- scripts/build/ci-build/Dockerfile | 1 - scripts/verify-repo-update/Dockerfile.deb | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/sources/setup-grafana/installation/debian.md b/docs/sources/setup-grafana/installation/debian.md index 18e2faedda7..fa741274e84 100644 --- a/docs/sources/setup-grafana/installation/debian.md +++ b/docs/sources/setup-grafana/installation/debian.md @@ -38,8 +38,6 @@ If you install from the APT repository, then Grafana is automatically updated ev #### To install the latest Enterprise edition: ```bash -sudo apt-get install -y apt-transport-https -sudo apt-get install -y software-properties-common wget wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add - ``` @@ -65,8 +63,7 @@ sudo apt-get install grafana-enterprise #### To install the latest OSS release: ```bash -sudo apt-get install -y apt-transport-https -sudo apt-get install -y software-properties-common wget +sudo apt-get install -y wget wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add - ``` diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index c34978124ea..48d42c36583 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -119,7 +119,6 @@ COPY --from=toolchain /tmp/dockerize /usr/local/bin/ RUN apt-get update && \ apt-get install -yq \ build-essential netcat-traditional clang gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-mingw-w64-x86-64 \ - apt-transport-https \ python-pip \ ca-certificates \ curl \ diff --git a/scripts/verify-repo-update/Dockerfile.deb b/scripts/verify-repo-update/Dockerfile.deb index 667f6155cee..ad651a1bdff 100644 --- a/scripts/verify-repo-update/Dockerfile.deb +++ b/scripts/verify-repo-update/Dockerfile.deb @@ -5,7 +5,6 @@ ARG PACKAGE=grafana RUN apt update && \ apt install -y curl \ - apt-transport-https \ ca-certificates \ gnupg && \ curl https://packages.grafana.com/gpg.key | apt-key add -