diff --git a/dockerfile b/dockerfile index d6fb504ef8982e5398ff4e67c9e5ea0c8fd6f2b5..0ee1ea43d19b55987ea0e64ef24a46bbd0572ba8 100644 --- a/dockerfile +++ b/dockerfile @@ -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 diff --git a/dockerfile-nogit b/dockerfile-nogit index 0ed6247d8729e689f2049f4b277083ec51ef1457..1de8f6f5ea5868616055794f252de8ec68a93b59 100644 --- a/dockerfile-nogit +++ b/dockerfile-nogit @@ -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 \ No newline at end of file + cmake .. && make firmware