Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing python in the dockerfiles

Browse Source 
For some misterious reason it broke...
This commit is contained in:
Erwin Ried 2020-05-20 14:48:44 +02:00
parent 9f72e62db7
commit 6e590d0764
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dockerfile
View File

@ -23,6 +23,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
#Fetch additional dependencies from Python 2.x pip
RUN pip install pyyaml
RUN ln -s /usr/bin/python3 /usr/bin/python && \
ln -s /usr/bin/pip3 /usr/bin/pip
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
#Grab the GNU ARM toolchain from arm.com
#Then extract contents to /opt/build/armbin/

9
dockerfile-nogit
View File

@ -11,7 +11,7 @@ WORKDIR /havoc/firmware
# Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y git tar wget dfu-util cmake python3 bzip2 ccache curl && \
apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 curl && \
apt-get -qy autoremove
#Install current pip from PyPa
@ -20,6 +20,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
#Fetch additional dependencies from Python 3.x pip
RUN pip install pyyaml
RUN ln -s /usr/bin/python3 /usr/bin/python && \
ln -s /usr/bin/pip3 /usr/bin/pip
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
# Grab the GNU ARM toolchain from arm.com
# Then extract contents to /opt/build/armbin/
@ -33,4 +38,4 @@ RUN mkdir ~/bin && cd ~/bin && \
for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
CMD cd .. && cd build && \
cmake .. && make firmware
cmake .. && make firmware