From 83c7bae84f4c2de8214f84f77d4c777e2bfae2fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Date: Wed, 1 Sep 2021 21:10:28 -0400 Subject: [PATCH] docker: Do not configure apt sources.list. As it is not necessary. Change-Id: Ic58236dc0da3c24a090c9f05437482b46892f6c5 --- docker/Dockerfile_debian_10 | 4 ---- docker/Dockerfile_debian_11 | 4 ---- docker/Dockerfile_debian_testing | 4 ---- docker/Dockerfile_debian_unstable | 4 ---- docker/Dockerfile_ubuntu_18.04 | 4 ---- docker/Dockerfile_ubuntu_20.04 | 4 ---- docker/Dockerfile_ubuntu_21.04 | 4 ---- 7 files changed, 28 deletions(-) diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10 index 561c27bd..558458dd 100644 --- a/docker/Dockerfile_debian_10 +++ b/docker/Dockerfile_debian_10 @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_debian_11 b/docker/Dockerfile_debian_11 index 8f6ba719..2169be2c 100644 --- a/docker/Dockerfile_debian_11 +++ b/docker/Dockerfile_debian_11 @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_debian_testing b/docker/Dockerfile_debian_testing index 65d3a126..f051e12f 100644 --- a/docker/Dockerfile_debian_testing +++ b/docker/Dockerfile_debian_testing @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_debian_unstable b/docker/Dockerfile_debian_unstable index e79dcccf..766e6bb2 100644 --- a/docker/Dockerfile_debian_unstable +++ b/docker/Dockerfile_debian_unstable @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index ae5bc5b0..7eaec558 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -11,10 +11,6 @@ RUN apt-get update && \ g++-8 \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04 index b79f1f5a..a5380711 100644 --- a/docker/Dockerfile_ubuntu_20.04 +++ b/docker/Dockerfile_ubuntu_20.04 @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/docker/Dockerfile_ubuntu_21.04 b/docker/Dockerfile_ubuntu_21.04 index 3dcbfb96..00615d45 100644 --- a/docker/Dockerfile_ubuntu_21.04 +++ b/docker/Dockerfile_ubuntu_21.04 @@ -9,10 +9,6 @@ RUN apt-get update && \ equivs \ wget -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control -- GitLab