Skip to content
Snippets Groups Projects
Unverified Commit 6f86ab42 authored by Maxim Cournoyer's avatar Maxim Cournoyer
Browse files

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
parent 78c6b88a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docker/Dockerfile_debian_10
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_debian_testing
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_debian_unstable
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_ubuntu_18.04
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_ubuntu_20.04
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_ubuntu_20.10
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
docker/Dockerfile_ubuntu_21.04
+ 2
− 2
View file @ 6f86ab42
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment