From eb3e244c51e327b839291afb1a1bb51d22dcd4bb Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 13 Jul 2018 11:04:09 +0200
Subject: [PATCH 1/2] Update hidapi, fixes #7542 (#9108)

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index af372b7e9..9ef5b9f99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1219,7 +1219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "hidapi"
 version = "0.3.1"
-source = "git+https://github.com/paritytech/hidapi-rs#70ec4bd1b755ec5dd32ad2be0c8345864147c8bc"
+source = "git+https://github.com/paritytech/hidapi-rs#d4d323767d6f27cf5a3d73fbae0b0f2134d579bf"
 dependencies = [
  "cc 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",

From 2521dcf6ec5294c9a8b851b18eb2186eace38c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andre.beat@gmail.com>
Date: Fri, 13 Jul 2018 11:09:41 +0100
Subject: [PATCH 2/2] docker: add cmake dependency (#9111)

---
 docker/alpine/Dockerfile         | 29 +++++++++++++++++++++++++++++
 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, 34 insertions(+), 3 deletions(-)
 create mode 100644 docker/alpine/Dockerfile

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
new file mode 100644
index 000000000..ad375e5a9
--- /dev/null
+++ b/docker/alpine/Dockerfile
@@ -0,0 +1,29 @@
+FROM alpine:edge
+
+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 cmake
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+	cargo build --release --verbose && \
+	ls /build/parity/target/release/parity && \
+	strip /build/parity/target/release/parity
+
+RUN file /build/parity/target/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/release/parity"]
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 \