From a111e4869c14660738cc948ca1928dc18594b7ca Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 7 Jun 2020 00:06:35 +0200
Subject: [PATCH] fix CI

---
 .../docker/Dockerfile.dev-debian-multiarch    | 47 +++++++++---------
 packaging/docker/Dockerfile.dev-raspbian      | 37 +++++++-------
 packaging/docker/Dockerfile.dev-ubuntu        | 48 ++++++++++---------
 3 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/packaging/docker/Dockerfile.dev-debian-multiarch b/packaging/docker/Dockerfile.dev-debian-multiarch
index ff021b8f4..c15183cc1 100644
--- a/packaging/docker/Dockerfile.dev-debian-multiarch
+++ b/packaging/docker/Dockerfile.dev-debian-multiarch
@@ -45,30 +45,33 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture ${ARCH}
 
 # Toolchain
-RUN apt-get update && apt-get install -y \
-	crossbuild-essential-${ARCH} \
-	autoconf automake autogen libtool \
-	pkg-config make \
-	texinfo git mercurial curl tar wget \
-	protobuf-compiler protobuf-c-compiler
+RUN apt-get update && \
+	apt-get install -y \
+		crossbuild-essential-${ARCH} \
+		autoconf automake autogen libtool \
+		pkg-config make \
+		texinfo git mercurial curl tar wget \
+		flex bison \
+		protobuf-compiler protobuf-c-compiler
 
 # Dependencies
-RUN apt-get update && apt-get install -y \
-	libssl-dev:${ARCH} \
-	libprotobuf-dev:${ARCH} \
-	libprotobuf-c-dev:${ARCH} \
-	uuid-dev:${ARCH} \
-	libconfig-dev:${ARCH} \
-	libnl-3-dev libnl-route-3-dev:${ARCH} \
-	libcurl4-openssl-dev:${ARCH} \
-	libjansson-dev:${ARCH} \
-	libzmq3-dev:${ARCH} \
-	libnanomsg-dev:${ARCH} \
-	librabbitmq-dev:${ARCH} \
-	libmosquitto-dev:${ARCH} \
-	libibverbs-dev:${ARCH} \
-	librdmacm-dev:${ARCH} \
-	libre-dev:${ARCH}
+RUN apt-get update && \
+	apt-get install -y \
+		libssl-dev:${ARCH} \
+		libprotobuf-dev:${ARCH} \
+		libprotobuf-c-dev:${ARCH} \
+		uuid-dev:${ARCH} \
+		libconfig-dev:${ARCH} \
+		libnl-3-dev libnl-route-3-dev:${ARCH} \
+		libcurl4-openssl-dev:${ARCH} \
+		libjansson-dev:${ARCH} \
+		libzmq3-dev:${ARCH} \
+		libnanomsg-dev:${ARCH} \
+		librabbitmq-dev:${ARCH} \
+		libmosquitto-dev:${ARCH} \
+		libibverbs-dev:${ARCH} \
+		librdmacm-dev:${ARCH} \
+		libre-dev:${ARCH}
 
 # Install cmake (version from buster has a bug)
 RUN cd /tmp && \
diff --git a/packaging/docker/Dockerfile.dev-raspbian b/packaging/docker/Dockerfile.dev-raspbian
index 113e6f421..b91188c9d 100644
--- a/packaging/docker/Dockerfile.dev-raspbian
+++ b/packaging/docker/Dockerfile.dev-raspbian
@@ -30,28 +30,29 @@ ARG VARIANT=unknown
 # Toolchain
 RUN apt-get update && \
     apt-get install -y \
-	autoconf automake autogen libtool cmake \
-	pkg-config make gcc g++\
-	git mercurial curl wget tar bzip2 \
-	protobuf-compiler protobuf-c-compiler
+		autoconf automake autogen libtool cmake \
+		pkg-config make gcc g++ \
+		git mercurial curl wget tar bzip2 \
+		flex bison \
+		protobuf-compiler protobuf-c-compiler
 
 # Dependencies
 RUN apt-get update && \
     apt-get install -y\
-	libssl-dev \
-	libprotobuf-dev \
-	libprotobuf-c-dev \
-	uuid-dev \
-	libconfig-dev \
-	libnl-3-dev libnl-route-3-dev \
-	libcurl4-openssl-dev \
-	libjansson-dev \
-	libzmq3-dev \
-	libnanomsg-dev \
-	librabbitmq-dev \
-	libmosquitto-dev \
-	librdmacm-dev \
-	libusb-1.0-0-dev
+		libssl-dev \
+		libprotobuf-dev \
+		libprotobuf-c-dev \
+		uuid-dev \
+		libconfig-dev \
+		libnl-3-dev libnl-route-3-dev \
+		libcurl4-openssl-dev \
+		libjansson-dev \
+		libzmq3-dev \
+		libnanomsg-dev \
+		librabbitmq-dev \
+		libmosquitto-dev \
+		librdmacm-dev \
+		libusb-1.0-0-dev
 
 ENV CC=gcc
 ENV CXX=g++
diff --git a/packaging/docker/Dockerfile.dev-ubuntu b/packaging/docker/Dockerfile.dev-ubuntu
index 81c142e56..25768ca59 100644
--- a/packaging/docker/Dockerfile.dev-ubuntu
+++ b/packaging/docker/Dockerfile.dev-ubuntu
@@ -39,31 +39,33 @@ ARG VARIANT=unknown
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Toolchain
-RUN apt-get update && apt-get install -y \
-	autoconf automake libtool cmake \
-	pkg-config make gcc g++ ninja-build \
-	texinfo git mercurial curl tar \
-	flex bison \
-	protobuf-compiler protobuf-c-compiler
+RUN apt-get update && \
+	apt-get install -y \
+		autoconf automake libtool cmake make \
+		pkg-config make gcc g++\
+		texinfo git mercurial curl tar \
+		flex bison \
+		protobuf-compiler protobuf-c-compiler
 
 # Dependencies
-RUN apt-get update && apt-get install -y \
-	libssl-dev \
-	libprotobuf-dev \
-	libprotobuf-c-dev \
-	uuid-dev \
-	libconfig-dev \
-	libnl-3-dev libnl-route-3-dev \
-	libcurl4-openssl-dev \
-	libjansson-dev \
-	libzmq3-dev \
-	libnanomsg-dev \
-	librabbitmq-dev \
-	libmosquitto-dev \
-	libcomedi-dev \
-	libibverbs-dev \
-	librdmacm-dev \
-	libusb-1.0-0-dev
+RUN apt-get update && \
+	apt-get install -y \
+		libssl-dev \
+		libprotobuf-dev \
+		libprotobuf-c-dev \
+		uuid-dev \
+		libconfig-dev \
+		libnl-3-dev libnl-route-3-dev \
+		libcurl4-openssl-dev \
+		libjansson-dev \
+		libzmq3-dev \
+		libnanomsg-dev \
+		librabbitmq-dev \
+		libmosquitto-dev \
+		libcomedi-dev \
+		libibverbs-dev \
+		librdmacm-dev \
+		libusb-1.0-0-dev
 
 # or install unpackaged dependencies from source
 ADD packaging/deps.sh /