From 973f87fe14141f3c776a88b675743c8a83364c4d Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Thu, 6 Jul 2017 15:58:44 -0400 Subject: [PATCH] docker: add/update platforms * Add: fedora-26 (64 bits only) and ubuntu 17.10 (artful, 32 and 64 bits) * Update: debian 9 (use new name and new 32-bits images) * Update: ubuntu 17.04 32-bits source image Change-Id: I4599554ad27906ba007d8f7910d27ce55eb92678 --- docker/Dockerfile_debian_9 | 2 +- docker/Dockerfile_debian_9_i386 | 2 +- docker/Dockerfile_fedora_26 | 58 +++++++++++++++++++++ docker/Dockerfile_ubuntu_17.04_i386 | 2 +- docker/Dockerfile_ubuntu_17.10 | 80 +++++++++++++++++++++++++++++ 5 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 docker/Dockerfile_fedora_26 create mode 100644 docker/Dockerfile_ubuntu_17.10 diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9 index a605a14f..c316443f 100644 --- a/docker/Dockerfile_debian_9 +++ b/docker/Dockerfile_debian_9 @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:9 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386 index b3873beb..9f8beed9 100644 --- a/docker/Dockerfile_debian_9_i386 +++ b/docker/Dockerfile_debian_9_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-debian32:9 +FROM i386/debian:9 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26 new file mode 100644 index 00000000..fd32a41b --- /dev/null +++ b/docker/Dockerfile_fedora_26 @@ -0,0 +1,58 @@ +FROM fedora:26 + +RUN dnf clean all +RUN dnf install -y yum-utils rpmdevtools + +RUN dnf clean all +RUN dnf upgrade -y && \ + dnf install -y \ + git \ + rpm-build \ + tar \ + make \ + autoconf \ + automake \ + cmake \ + speexdsp-devel \ + pulseaudio-libs-devel \ + libsamplerate-devel \ + libtool \ + dbus-devel \ + expat-devel \ + pcre-devel \ + yaml-cpp-devel \ + boost-devel \ + dbus-c++-devel \ + dbus-devel \ + libsndfile-devel \ + libXext-devel \ + libXfixes-devel \ + yasm \ + speex-devel \ + gsm-devel \ + chrpath \ + check \ + astyle \ + uuid-c++-devel \ + libupnp-devel \ + gettext-devel \ + gcc-c++ \ + which \ + alsa-lib-devel \ + systemd-devel \ + libuuid-devel \ + uuid-devel \ + gnutls-devel \ + nettle-devel \ + opus-devel \ + patch \ + jsoncpp-devel \ + libnatpmp-devel \ + webkitgtk4-devel \ + cryptopp-devel \ + libva-devel \ + libvdpau-devel + +ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh + +CMD /opt/build-package-fedora.sh diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386 index 1e22614f..4214187c 100644 --- a/docker/Dockerfile_ubuntu_17.04_i386 +++ b/docker/Dockerfile_ubuntu_17.04_i386 @@ -1,4 +1,4 @@ -FROM savoirfairelinux/ring-ubuntu32:17.04 +FROM i386/ubuntu:17.10 ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10 new file mode 100644 index 00000000..34c6766d --- /dev/null +++ b/docker/Dockerfile_ubuntu_17.10 @@ -0,0 +1,80 @@ +FROM ubuntu:artful + +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