diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10 index bded38b4e988e7bd5596424d74c0d5283dd2bf97..5103cb1d9a54948395f27f02b58d223940e95216 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 3afff6ffa489572efd4a5169a74f63fad93f6524..d96630cb3611a3688e32b844013cd20fe2820ded 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 2cd24427509a69aeb72f6445a1b7f24fc0d41a6d..ea79b312fd0ed5605a3d81f17139fa8735383fa9 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 2c26aeab2794037e0a152bbc069f9cd6399785f0..202d28e99b935a8735ca106d7127e61eaac33799 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 30ef21ddfaa282d2ffc089ffdb7df2a8931ffd72..69f26e748075b9a718096c63f0366ecd02971280 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 987ae5cfd645d2a1a8eee802ce7c3674f8eb5eda..9cd7a3bd8ecde34927b6f61a404881b84fab512d 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 7cf77ae7c9fad9958acc96347ce6aa4e32382298..05ee0f295df010fa305e1f77669e30ed17d2ddba 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