From 4b8c418dbc8365136167d3457b807ef59a998570 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 30 Apr 2019 13:13:57 +0200
Subject: [PATCH] core: fix docker build

---
 Pipfile.lock         | 10 +++++-----
 ci/Dockerfile        |  2 +-
 core/build-docker.sh |  3 ++-
 shell.nix            |  2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 9f9cf4f75..46feef5f6 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -247,9 +247,9 @@
         },
         "inform": {
             "hashes": [
-                "sha256:15814162c32cb245395234767dc6996e13f32623dbaffd94c22af2eab57644b3"
+                "sha256:9fa86429435552ecba03eeae34fb2864049b16ad59ac888cb125e49f9ad36632"
             ],
-            "version": "==1.15.0"
+            "version": "==1.16.0"
         },
         "isort": {
             "hashes": [
@@ -381,10 +381,10 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:8257baf496c8522437e8a6cfe0f15e00aedc6c0e0e7c9d55eeeeab31e0853843",
-                "sha256:8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"
+                "sha256:6901995b9b686cb90cceba67a0f6d4d14ae003cd59bc12beb61549bdfbe3bc89",
+                "sha256:d950c64aeea5456bbd147468382a5bb77fe692c13c9f00f0219814ce5b642755"
             ],
-            "version": "==5.1.3"
+            "version": "==5.2.0"
         },
         "pep8": {
             "hashes": [
diff --git a/ci/Dockerfile b/ci/Dockerfile
index f0fe5966c..20d453a8c 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -9,7 +9,7 @@ ENV TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR
 
 RUN apt-get update && apt-get install -y \
     build-essential wget git libsodium-dev graphviz \
-    valgrind check libssl-dev libusb-1.0-0-dev libudev-dev
+    valgrind check libssl-dev libusb-1.0-0-dev libudev-dev zlib1g-dev
 
 # TODO are all apt packages actually needed?
 
diff --git a/core/build-docker.sh b/core/build-docker.sh
index 52843e93e..82b9a7317 100755
--- a/core/build-docker.sh
+++ b/core/build-docker.sh
@@ -34,4 +34,5 @@ docker run -t -v $(pwd):/local -v $(pwd)/build/core:/build:z --user="$USER:$GROU
 	ln -s /build build &&
 	git checkout $TAG && \
 	git submodule update --init --recursive && \
-	PRODUCTION=$PRODUCTION make clean vendor build_boardloader build_bootloader build_firmware"
+	pipenv install && \
+	PRODUCTION=$PRODUCTION pipenv run make clean vendor build_boardloader build_bootloader build_firmware"
diff --git a/shell.nix b/shell.nix
index 00d9ae5ba..efbcd3ddd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -30,10 +30,12 @@ in
       gnumake
       graphviz
       openssl
+      pipenv
       pkgconfig
       protobuf
       python2Packages.demjson
       scons
       valgrind
+      zlib
     ];
   }