diff --git a/docker/Dockerfile_debian8 b/docker/Dockerfile_debian8 index bced958d31a5a304c7174fbecb3b3d2dc5cf7577..c7362f584d04620dfef1d2293c7e60fa08ed4daf 100644 --- a/docker/Dockerfile_debian8 +++ b/docker/Dockerfile_debian8 @@ -1,9 +1,11 @@ FROM debian:8 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_debian8_i386 b/docker/Dockerfile_debian8_i386 index c0d2db01ab5f977877ae4e129c45b078b325ad99..333f015e1600f5e5879d60b59652644924f7e8be 100644 --- a/docker/Dockerfile_debian8_i386 +++ b/docker/Dockerfile_debian8_i386 @@ -1,9 +1,11 @@ FROM savoirfairelinux/ring-debian32:8 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_debian9 b/docker/Dockerfile_debian9 index ef32b438b5df2e05200b698c22402d2026954602..93056f101f3de837484f5840e14d59cec46c09cb 100644 --- a/docker/Dockerfile_debian9 +++ b/docker/Dockerfile_debian9 @@ -1,9 +1,11 @@ FROM debian:stretch +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_debian9_i386 b/docker/Dockerfile_debian9_i386 index ed3bbdae4af971fe90381222d73dc50543e5eb26..33e3903baf0408e765a465a8a60f067d350edb0c 100644 --- a/docker/Dockerfile_debian9_i386 +++ b/docker/Dockerfile_debian9_i386 @@ -1,9 +1,11 @@ FROM savoirfairelinux/ring-debian32:9 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu14.04 b/docker/Dockerfile_ubuntu14.04 index 032d07dba598ed2cb4964b66f483b7a216b5d91c..b1f3655eb4f46c65427d21f33ee06ea27e274206 100644 --- a/docker/Dockerfile_ubuntu14.04 +++ b/docker/Dockerfile_ubuntu14.04 @@ -1,9 +1,11 @@ FROM ubuntu:14.04 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu14.04_i386 b/docker/Dockerfile_ubuntu14.04_i386 index 215ea7cc3971b583472556b133103717c6fd6a8b..5a2b396f9080da79f25788b8d31e3f1ef281e33e 100644 --- a/docker/Dockerfile_ubuntu14.04_i386 +++ b/docker/Dockerfile_ubuntu14.04_i386 @@ -1,9 +1,11 @@ FROM savoirfairelinux/ring-ubuntu32:14.04 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu15.10 b/docker/Dockerfile_ubuntu15.10 index 34132a5d61b493b9e741437bc93b3040c37e885f..cfeb2154df5708d796dc058bd4601a92d44d6310 100644 --- a/docker/Dockerfile_ubuntu15.10 +++ b/docker/Dockerfile_ubuntu15.10 @@ -1,9 +1,11 @@ FROM ubuntu:15.10 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu15.10_i386 b/docker/Dockerfile_ubuntu15.10_i386 index be1187eac88e0fa84b79b939d1b3d2fc1f93467e..0b323474d8a50e593598058226b6be261e025933 100644 --- a/docker/Dockerfile_ubuntu15.10_i386 +++ b/docker/Dockerfile_ubuntu15.10_i386 @@ -1,9 +1,11 @@ FROM savoirfairelinux/ring-ubuntu32:15.10 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu16.04 b/docker/Dockerfile_ubuntu16.04 index e3b46dcf6c7aa333475cfe0ad9b12be67aa436ba..028215189a01756e1103434a85d69edee618567a 100644 --- a/docker/Dockerfile_ubuntu16.04 +++ b/docker/Dockerfile_ubuntu16.04 @@ -1,9 +1,11 @@ FROM ubuntu:16.04 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/docker/Dockerfile_ubuntu16.04_i386 b/docker/Dockerfile_ubuntu16.04_i386 index 523ac65dd17ca1dfa8d13f3a220534e462e986b4..7e3936d5fcf9219733e0e6845b346ef00fb99d52 100644 --- a/docker/Dockerfile_ubuntu16.04_i386 +++ b/docker/Dockerfile_ubuntu16.04_i386 @@ -1,9 +1,11 @@ FROM savoirfairelinux/ring-ubuntu32:16.04 +RUN apt-get clean RUN apt-get update && \ apt-get install -y vim devscripts equivs # Speed up mk-build-deps +RUN apt-get clean RUN apt-get update && \ apt-get install -y -o Acquire::Retires=10 \ autoconf \ diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh index 429f3c64aa3cef52eda0f6c2f0401738fef3d34e..75b976daf88d6b169f19b4d076de77e66e9ab25c 100755 --- a/scripts/build-package-debian.sh +++ b/scripts/build-package-debian.sh @@ -35,6 +35,7 @@ else fi # install build deps +apt-get clean apt-get update apt-get upgrade -o Acquire::Retires=10 -y mk-build-deps --remove --install debian/control -t "apt-get -y --no-install-recommends"