From 5859073cb899ff2b477f66f1e790d7e46309164e Mon Sep 17 00:00:00 2001
From: Nicolas Stalder <n@stalder.io>
Date: Wed, 27 Feb 2019 21:40:58 +0100
Subject: [PATCH] Build bundle-hacker-{version}.hex

---
 Dockerfile         | 6 ++++--
 in-docker-build.sh | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c1f133..3fc5ef9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,10 @@ RUN echo "e5e5b4cd2a918e0e96b395534222773f7241dc59d776db1b9f7fedfcb489157a  mini
 RUN sha256sum -c miniconda.sha256
 
 RUN bash ./miniconda.sh -b -p /opt/conda
-RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python3
-RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python
+RUN ln -s /opt/conda/bin/python /usr/local/bin/python3
+RUN ln -s /opt/conda/bin/python /usr/local/bin/python
+RUN ln -s /opt/conda/bin/pip /usr/local/bin/pip3
+RUN ln -s /opt/conda/bin/pip /usr/local/bin/pip
 
 # 3. Source code
 RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo --config core.autocrlf=input
diff --git a/in-docker-build.sh b/in-docker-build.sh
index d726ac0..2c9e786 100755
--- a/in-docker-build.sh
+++ b/in-docker-build.sh
@@ -35,3 +35,10 @@ build bootloader nonverifying
 build bootloader verifying
 build firmware hacker solo
 build firmware secure solo
+
+pip install -U pip
+pip install -U solo-python
+cd ${out_dir}
+bundle="bundle-hacker-${version}"
+/opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-${version}.hex ${bundle}.hex
+sha256sum ${bundle}.hex > ${bundle}.sha2