From 993650f3d63c04fe2f636bfaeeb02cfa301e3c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 13 Jul 2018 11:09:41 +0100 Subject: [PATCH] docker: add cmake dependency (#9111) --- docker/alpine/Dockerfile | 2 +- docker/centos/Dockerfile | 2 +- docker/hub/Dockerfile | 1 + docker/ubuntu-aarch64/Dockerfile | 2 +- docker/ubuntu-arm/Dockerfile | 2 +- docker/ubuntu/Dockerfile | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 4d08afd3f..ad375e5a9 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /build # install tools and dependencies RUN apk add --no-cache gcc musl-dev pkgconfig g++ make curl \ eudev-dev rust cargo git file binutils \ - libusb-dev linux-headers perl + libusb-dev linux-headers perl cmake # show backtraces ENV RUST_BACKTRACE 1 diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile index 747a227c9..7c944001e 100644 --- a/docker/centos/Dockerfile +++ b/docker/centos/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /build # install tools and dependencies RUN yum -y update&& \ - yum install -y git make gcc-c++ gcc file binutils + yum install -y git make gcc-c++ gcc file binutils cmake # install rustup RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\ diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index 71655036e..c6d812446 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && \ # add-apt-repository software-properties-common \ make \ + cmake \ curl \ wget \ git \ diff --git a/docker/ubuntu-aarch64/Dockerfile b/docker/ubuntu-aarch64/Dockerfile index eee1587f4..5eefe3dbd 100644 --- a/docker/ubuntu-aarch64/Dockerfile +++ b/docker/ubuntu-aarch64/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get -y update && \ apt-get install -y --force-yes --no-install-recommends \ curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \ libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \ - binutils-aarch64-linux-gnu \ + binutils-aarch64-linux-gnu cmake \ && \ apt-get clean diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile index f971c98f1..d924a20f5 100644 --- a/docker/ubuntu-arm/Dockerfile +++ b/docker/ubuntu-arm/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get -y update && \ apt-get install -y --force-yes --no-install-recommends \ curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \ libc6-dev-armhf-cross wget file ca-certificates \ - binutils-arm-linux-gnueabihf \ + binutils-arm-linux-gnueabihf cmake \ && \ apt-get clean diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index e840cdc6e..83bf1567a 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update && \ apt-get install -y \ g++ \ build-essential \ + cmake \ curl \ git \ file \