From b6cf1ad5fd2e6cf7ddad4b4960026b2f3bc13fe5 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 15 May 2017 13:18:38 -0400
Subject: [PATCH] docker: use system msgpack, argon2 on recent Ubuntu/Debian

msgpack-c and argon2 are now packaged in Ubuntu/Debian,
use them to reduce contrib build time and check for
compatibility with CI.

Change-Id: I5791546b6ca7aae1fded89fa8d772c955b4f68eb
---
 docker/Dockerfile_debian_9          | 2 ++
 docker/Dockerfile_debian_9_i386     | 2 ++
 docker/Dockerfile_ubuntu_17.04      | 2 ++
 docker/Dockerfile_ubuntu_17.04_i386 | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index e39b948b..6390ae93 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -18,6 +18,7 @@ RUN apt-get update && \
         libdbus-1-dev \
         libdbus-c++-dev \
         libupnp-dev \
+        libargon2-0-dev \
         libebook1.2-dev \
         libclutter-gtk-1.0-dev \
         libclutter-1.0-dev \
@@ -52,6 +53,7 @@ RUN apt-get update && \
         libudev-dev \
         libgsm1-dev \
         libjsoncpp-dev \
+        libmsgpack-dev \
         libnatpmp-dev \
         libappindicator3-dev \
         libqrencode-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index b0e1de00..138fe066 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -18,6 +18,7 @@ RUN apt-get update && \
         libdbus-1-dev \
         libdbus-c++-dev \
         libupnp-dev \
+        libargon2-0-dev \
         libebook1.2-dev \
         libclutter-gtk-1.0-dev \
         libclutter-1.0-dev \
@@ -52,6 +53,7 @@ RUN apt-get update && \
         libudev-dev \
         libgsm1-dev \
         libjsoncpp-dev \
+        libmsgpack-dev \
         libnatpmp-dev \
         libappindicator3-dev \
         libqrencode-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index 952b329f..9f7b6d99 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -29,6 +29,7 @@ RUN apt-get update && \
         libdbus-c++-dev \
         libupnp-dev \
         libgnutls28-dev \
+        libargon2-0-dev \
         libebook1.2-dev \
         libclutter-gtk-1.0-dev \
         libclutter-1.0-dev \
@@ -63,6 +64,7 @@ RUN apt-get update && \
         libudev-dev \
         libgsm1-dev \
         libjsoncpp-dev \
+        libmsgpack-dev \
         libnatpmp-dev \
         libappindicator3-dev \
         libqrencode-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index 9cb32c29..bb24cd23 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -29,6 +29,7 @@ RUN apt-get update && \
         libdbus-c++-dev \
         libupnp-dev \
         libgnutls28-dev \
+        libargon2-0-dev \
         libebook1.2-dev \
         libclutter-gtk-1.0-dev \
         libclutter-1.0-dev \
@@ -63,6 +64,7 @@ RUN apt-get update && \
         libudev-dev \
         libgsm1-dev \
         libjsoncpp-dev \
+        libmsgpack-dev \
         libnatpmp-dev \
         libappindicator3-dev \
         libqrencode-dev \
-- 
GitLab