From 30f73b41e4d0881d6784e0b4c586ac800a058c0a Mon Sep 17 00:00:00 2001 From: Chris Cinelli Date: Thu, 24 Oct 2019 00:18:33 -0700 Subject: [PATCH] Move python install in the docker file --- Dockerfile | 3 +-- in-docker-build.sh | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 138fe49..53b4c0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,5 +29,4 @@ 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 +RUN pip install -U pip && pip install -U solo-python \ No newline at end of file diff --git a/in-docker-build.sh b/in-docker-build.sh index cd12b33..395a5a1 100755 --- a/in-docker-build.sh +++ b/in-docker-build.sh @@ -40,8 +40,6 @@ build firmware hacker-debug-2 solo build firmware secure solo build firmware secure-non-solokeys 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