From 6f86ab42c0a6f897efb15b961bd6300149e04665 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com> Date: Wed, 23 Jun 2021 09:12:28 -0400 Subject: [PATCH] docker: Only copy the control files in the container. This avoids invalidating the cache when changing the rules file of the packages, for example. Automated via: $ git ls-files | grep Dockerfile | xargs sed -i 's,packaging/rules/debian-qt/\* /tmp/builddeps/debian/,packaging/rules/debian-qt/control /tmp/builddeps/debian/control,g' $ $ git ls-files | grep Dockerfile | xargs sed -i 's,packaging/rules/debian/\* /tmp/builddeps/debian/,packaging/rules/debian/control /tmp/builddeps/debian/control,g' Change-Id: Ic33d7af4c022ed9de53df245c861a31d2786fc96 --- docker/Dockerfile_debian_10 | 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_20.10 | 4 ++-- docker/Dockerfile_ubuntu_21.04 | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10 index bded38b4..5103cb1d 100644 --- a/docker/Dockerfile_debian_10 +++ b/docker/Dockerfile_debian_10 @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_debian_testing b/docker/Dockerfile_debian_testing index 3afff6ff..d96630cb 100644 --- a/docker/Dockerfile_debian_testing +++ b/docker/Dockerfile_debian_testing @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_debian_unstable b/docker/Dockerfile_debian_unstable index 2cd24427..ea79b312 100644 --- a/docker/Dockerfile_debian_unstable +++ b/docker/Dockerfile_debian_unstable @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 2c26aeab..202d28e9 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -17,10 +17,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50 diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04 index 30ef21dd..69f26e74 100644 --- a/docker/Dockerfile_ubuntu_20.04 +++ b/docker/Dockerfile_ubuntu_20.04 @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.10 index 987ae5cf..9cd7a3bd 100644 --- a/docker/Dockerfile_ubuntu_20.10 +++ b/docker/Dockerfile_ubuntu_20.10 @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh diff --git a/docker/Dockerfile_ubuntu_21.04 b/docker/Dockerfile_ubuntu_21.04 index 7cf77ae7..05ee0f29 100644 --- a/docker/Dockerfile_ubuntu_21.04 +++ b/docker/Dockerfile_ubuntu_21.04 @@ -15,10 +15,10 @@ RUN apt-get clean && apt-get update ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh -COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/ +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh qt-deps -COPY packaging/rules/debian/* /tmp/builddeps/debian/ +COPY packaging/rules/debian/control /tmp/builddeps/debian/control RUN /opt/prebuild-package-debian.sh jami-deps ADD scripts/build-package-debian.sh /opt/build-package-debian.sh -- GitLab