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 <simon@sdeziel.info>
* Stop pulling software-properties-common (unused)
software-properties-common was used for the add-apt-repository
command that is no longer used since commit 26cf3d9c66
Signed-off-by: Simon Deziel <simon@sdeziel.info>
This commit is contained in:
@@ -38,8 +38,6 @@ If you install from the APT repository, then Grafana is automatically updated ev
|
|||||||
#### To install the latest Enterprise edition:
|
#### To install the latest Enterprise edition:
|
||||||
|
|
||||||
```bash
|
```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 -
|
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:
|
#### To install the latest OSS release:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get install -y apt-transport-https
|
sudo apt-get install -y wget
|
||||||
sudo apt-get install -y software-properties-common wget
|
|
||||||
wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add -
|
wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add -
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,6 @@ COPY --from=toolchain /tmp/dockerize /usr/local/bin/
|
|||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -yq \
|
apt-get install -yq \
|
||||||
build-essential netcat-traditional clang gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-mingw-w64-x86-64 \
|
build-essential netcat-traditional clang gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-mingw-w64-x86-64 \
|
||||||
apt-transport-https \
|
|
||||||
python-pip \
|
python-pip \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ ARG PACKAGE=grafana
|
|||||||
|
|
||||||
RUN apt update && \
|
RUN apt update && \
|
||||||
apt install -y curl \
|
apt install -y curl \
|
||||||
apt-transport-https \
|
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
gnupg && \
|
gnupg && \
|
||||||
curl https://packages.grafana.com/gpg.key | apt-key add -
|
curl https://packages.grafana.com/gpg.key | apt-key add -
|
||||||
|
|||||||
Reference in New Issue
Block a user