Selaa lähdekoodia

Drop transitional package apt-transport-https (#5950)

Robin Schneider 2 vuotta sitten
vanhempi
sitoutus
d75c699ad4

+ 2 - 2
Dockerfile

@@ -31,7 +31,7 @@ ARG LEVEL_ZERO_VERSION=1.3.22549
 # mesa-va-drivers: needed for AMD VAAPI. Mesa >= 20.1 is required for HEVC transcoding.
 # mesa-va-drivers: needed for AMD VAAPI. Mesa >= 20.1 is required for HEVC transcoding.
 # curl: healthcheck
 # curl: healthcheck
 RUN apt-get update \
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg wget apt-transport-https curl \
+ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg wget curl \
  && wget -O - https://repo.jellyfin.org/jellyfin_team.gpg.key | apt-key add - \
  && wget -O - https://repo.jellyfin.org/jellyfin_team.gpg.key | apt-key add - \
  && echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/$( awk -F'=' '/^ID=/{ print $NF }' /etc/os-release ) $( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release ) main" | tee /etc/apt/sources.list.d/jellyfin.list \
  && echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/$( awk -F'=' '/^ID=/{ print $NF }' /etc/os-release ) $( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release ) main" | tee /etc/apt/sources.list.d/jellyfin.list \
  && apt-get update \
  && apt-get update \
@@ -53,7 +53,7 @@ RUN apt-get update \
  && dpkg -i *.deb \
  && dpkg -i *.deb \
  && cd .. \
  && cd .. \
  && rm -rf intel-compute-runtime \
  && rm -rf intel-compute-runtime \
- && apt-get remove gnupg wget apt-transport-https -y \
+ && apt-get remove gnupg wget -y \
  && apt-get clean autoclean -y \
  && apt-get clean autoclean -y \
  && apt-get autoremove -y \
  && apt-get autoremove -y \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /var/lib/apt/lists/* \

+ 1 - 1
deployment/Dockerfile.debian.amd64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts build-essential mmv \
+    debhelper gnupg devscripts build-essential mmv \
     libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev \
     libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev \
     libssl1.1 liblttng-ust0
     libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.debian.arm64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts build-essential mmv
+    debhelper gnupg devscripts build-essential mmv
 
 
 # Prepare the cross-toolchain
 # Prepare the cross-toolchain
 RUN dpkg --add-architecture arm64 \
 RUN dpkg --add-architecture arm64 \

+ 1 - 1
deployment/Dockerfile.debian.armhf

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts build-essential mmv
+    debhelper gnupg devscripts build-essential mmv
 
 
 # Prepare the cross-toolchain
 # Prepare the cross-toolchain
 RUN dpkg --add-architecture armhf \
 RUN dpkg --add-architecture armhf \

+ 1 - 1
deployment/Dockerfile.linux.amd64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts unzip \
+    debhelper gnupg devscripts unzip \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.linux.amd64-musl

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts unzip \
+    debhelper gnupg devscripts unzip \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.linux.arm64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts unzip \
+    debhelper gnupg devscripts unzip \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.linux.armhf

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts unzip \
+    debhelper gnupg devscripts unzip \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.macos

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts \
+    debhelper gnupg devscripts \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.portable

@@ -11,7 +11,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts \
+    debhelper gnupg devscripts \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.ubuntu.amd64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg wget ca-certificates devscripts \
+    debhelper gnupg wget ca-certificates devscripts \
     mmv build-essential libcurl4-openssl-dev libfontconfig1-dev \
     mmv build-essential libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
 
 

+ 1 - 1
deployment/Dockerfile.ubuntu.arm64

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg wget ca-certificates devscripts \
+    debhelper gnupg wget ca-certificates devscripts \
     mmv build-essential lsb-release
     mmv build-essential lsb-release
 
 
 # Install dotnet repository
 # Install dotnet repository

+ 1 - 1
deployment/Dockerfile.ubuntu.armhf

@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg wget ca-certificates devscripts \
+    debhelper gnupg wget ca-certificates devscripts \
     mmv build-essential lsb-release
     mmv build-essential lsb-release
 
 
 # Install dotnet repository
 # Install dotnet repository

+ 1 - 1
deployment/Dockerfile.windows.amd64

@@ -11,7 +11,7 @@ ENV IS_DOCKER=YES
 # Prepare Debian build environment
 # Prepare Debian build environment
 RUN apt-get update -yqq \
 RUN apt-get update -yqq \
   && apt-get install -yqq --no-install-recommends \
   && apt-get install -yqq --no-install-recommends \
-    apt-transport-https debhelper gnupg devscripts unzip \
+    debhelper gnupg devscripts unzip \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     mmv libcurl4-openssl-dev libfontconfig1-dev \
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 zip
     libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 zip