shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Move python install in the docker file

Browse Source
This commit is contained in:
Chris Cinelli 2019-10-24 00:18:33 -07:00 committed by Conor Patrick
parent 6f6e831fba
commit 30f73b41e4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -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/pip3
RUN ln -s /opt/conda/bin/pip /usr/local/bin/pip RUN ln -s /opt/conda/bin/pip /usr/local/bin/pip
# 3. Source code RUN pip install -U pip && pip install -U solo-python
RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo --config core.autocrlf=input

2
in-docker-build.sh
View File

@ -40,8 +40,6 @@ build firmware hacker-debug-2 solo
build firmware secure solo build firmware secure solo
build firmware secure-non-solokeys solo build firmware secure-non-solokeys solo
pip install -U pip
pip install -U solo-python
cd ${out_dir} cd ${out_dir}
bundle="bundle-hacker-${version}" bundle="bundle-hacker-${version}"
/opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-${version}.hex ${bundle}.hex /opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-${version}.hex ${bundle}.hex