From 307b3a742bf3d96a6a1d79b9b9abd8d7191b8809 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Wed, 19 Sep 2018 20:30:00 +0200
Subject: [PATCH] fix Docker build

---
 Dockerfile               | 9 +++++----
 firmware/protob/Makefile | 2 +-
 vendor/trezor-common     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4384a0908f..4b59b619ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,11 @@ RUN apt-get update && \
 ENV PROTOBUF_VERSION=3.4.0
 RUN curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip"
 
+ENV PYTHON=python3
+
 # use zipfile module to extract files world-readable
-RUN python3 -m zipfile -e "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" /usr/local && chmod 755 /usr/local/bin/protoc
+RUN $PYTHON -m zipfile -e "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" /usr/local && chmod 755 /usr/local/bin/protoc
 
-RUN pip3 install pipenv
+ENV WORKON_HOME=/tmp/.venvs
 
-
-RUN ln -s python3 /usr/bin/python
+RUN $PYTHON -m pip install pipenv
diff --git a/firmware/protob/Makefile b/firmware/protob/Makefile
index 4b372fe5bb..0cf8453c18 100644
--- a/firmware/protob/Makefile
+++ b/firmware/protob/Makefile
@@ -26,7 +26,7 @@ messages_%_pb2.py: messages-%.proto
 	$(Q)protoc -I/usr/include -I. $< --python_out=.
 
 messages_map.h: messages_map.py messages_pb2.py
-	$(Q)$(PYTHON) $< | grep -v -e MessageType_Cardano -e MessageType_Tezos -e MessageType_Ripple -e MessageType_Monero -e MessageType_DebugMonero -e MessageType_Ontology > $@
+	$(Q)$(PYTHON) $< | grep -v -e MessageType_Cardano -e MessageType_Tezos -e MessageType_Ripple -e MessageType_Monero -e MessageType_DebugMonero -e MessageType_Ontology -e MessageType_Tron > $@
 
 clean:
 	rm -f *.pb *.o *.d *.pb.c *.pb.h *_pb2.py messages_map.h
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 5d472e8a11..f60b722638 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 5d472e8a116c2c9cf6c1a6d0e1de0a1465377d91
+Subproject commit f60b722638116a878d88b9f9393f311f8b45834e