From 3ae55d42a8ff6d7c202dda71fc4f362b1615c333 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Thu, 6 Jul 2017 17:21:00 -0400 Subject: [PATCH] docker: update all i386 image sources Use images from a non-official but officialy annouced on the main-stream docker repository, than using our personal and not-so-maintained images. https://github.com/docker-library/official-images#architectures-other-than-amd64 Change-Id: I7781aead8e2cfdda19d086842f35f2d9739f3533 Note: add also 17.10_i386 dockerfile --- docker/Dockerfile_debian_8_i386 | 2 +- docker/Dockerfile_ubuntu_14.04_i386 | 2 +- docker/Dockerfile_ubuntu_15.10_i386 | 2 +- docker/Dockerfile_ubuntu_16.04_i386 | 2 +- docker/Dockerfile_ubuntu_16.10_i386 | 2 +- docker/Dockerfile_ubuntu_17.04_i386 | 2 +- docker/Dockerfile_ubuntu_17.10_i386 | 80 +++++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 docker/Dockerfile_ubuntu_17.10_i386 diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386 index 9d997c01..52f5d860 100644 --- a/docker/Dockerfile_debian_8_i386 +++ b/docker/Dockerfile_debian_8_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-debian32:8 +FROM i386/debian:8 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386 index 633c7f6c..ec3b4f88 100644 --- a/docker/Dockerfile_ubuntu_14.04_i386 +++ b/docker/Dockerfile_ubuntu_14.04_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-ubuntu32:14.04 +FROM i386/ubuntu:14.04 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386 index e43dd3dd..3052c671 100644 --- a/docker/Dockerfile_ubuntu_15.10_i386 +++ b/docker/Dockerfile_ubuntu_15.10_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-ubuntu32:15.10 +FROM i386/ubuntu:15.10 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386 index 2e49cc10..07fc3394 100644 --- a/docker/Dockerfile_ubuntu_16.04_i386 +++ b/docker/Dockerfile_ubuntu_16.04_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-ubuntu32:16.04 +FROM i386/ubuntu:16.04 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386 index 4ace40ba..6f55736b 100644 --- a/docker/Dockerfile_ubuntu_16.10_i386 +++ b/docker/Dockerfile_ubuntu_16.10_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-ubuntu32:16.10 +FROM i386/ubuntu:16.10 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386 index 4214187c..93c41594 100644 --- a/docker/Dockerfile_ubuntu_17.04_i386 +++ b/docker/Dockerfile_ubuntu_17.04_i386 @@ -1,4 +1,4 @@ -FROM i386/ubuntu:17.10 +FROM i386/ubuntu:17.04 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386 new file mode 100644 index 00000000..4214187c --- /dev/null +++ b/docker/Dockerfile_ubuntu_17.10_i386 @@ -0,0 +1,80 @@ +FROM i386/ubuntu:17.10 + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get clean +RUN apt-get update && \ + apt-get install -y vim \ + devscripts \ + software-properties-common + +# software-properties-common is needed for +# add-apt-repository +RUN add-apt-repository universe + +RUN apt-get clean +RUN apt-get update && \ + apt-get install -y equivs + +# Speed up mk-build-deps +RUN apt-get clean +RUN apt-get update && \ + apt-get install -y -o Acquire::Retires=10 \ + git \ + autoconf \ + automake \ + autopoint \ + cmake \ + libtool \ + libdbus-1-dev \ + libdbus-c++-dev \ + libupnp-dev \ + libgnutls28-dev \ + libargon2-0-dev \ + libebook1.2-dev \ + libclutter-gtk-1.0-dev \ + libclutter-1.0-dev \ + libglib2.0-dev \ + libgtk-3-dev \ + libnotify-dev \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + yasm \ + autotools-dev \ + gettext \ + libpulse-dev \ + libsamplerate0-dev \ + libasound2-dev \ + libexpat1-dev \ + libpcre3-dev \ + libyaml-cpp-dev \ + libboost-dev \ + libsndfile1-dev \ + libxext-dev \ + libxfixes-dev \ + libspeex-dev \ + libspeexdsp-dev \ + uuid-dev \ + libavcodec-dev \ + libavutil-dev \ + libavformat-dev \ + libswscale-dev \ + libavdevice-dev \ + libopus-dev \ + libudev-dev \ + libgsm1-dev \ + libjsoncpp-dev \ + libmsgpack-dev \ + libnatpmp-dev \ + libappindicator3-dev \ + libqrencode-dev \ + libnm-glib-dev \ + libwebkit2gtk-4.0-dev \ + libcrypto++-dev \ + libva-dev \ + libvdpau-dev + +ADD scripts/build-package-debian.sh /opt/build-package-debian.sh + +CMD /opt/build-package-debian.sh -- GitLab