TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-04 23:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the docker build process by installing pip manually

Browse Source
This commit is contained in:
Yannick M. Dixken 2020-05-15 00:31:20 +02:00
parent f4ebf4a2d5
commit 4c60aed563
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockerfile
View File

@ -14,8 +14,13 @@ COPY ./ /havocsrc
#Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y tar wget dfu-util cmake python python-pip && \
apt-get install -y tar wget dfu-util cmake python curl && \
apt-get -qy autoremove
#Install pip from PyPa
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python get-pip.py
#Fetch additional dependencies from Python 2.x pip
RUN pip install pyyaml

8
dockerfile-nogit
View File

@ -11,9 +11,13 @@ WORKDIR /havoc/firmware
# Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y git tar wget dfu-util cmake python3 python-pip ccache && \
apt-get install -y git tar wget dfu-util cmake python3 ccache curl && \
apt-get -qy autoremove
#Install pip from PyPa
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python get-pip.py
RUN pip install pyyaml
# Grab the GNU ARM toolchain from arm.com
@ -28,4 +32,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