diff --git a/.travis.yml b/.travis.yml index 9730d81b..060e85cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,4 +53,3 @@ addons: - sed - cmake - dfu-util - diff --git a/dockerfile b/dockerfile index a087fcd2..750ecb90 100644 --- a/dockerfile +++ b/dockerfile @@ -24,9 +24,9 @@ RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \ #Fetch additional dependencies from Python 2.x pip RUN pip install pyyaml RUN rm -rf /usr/bin/python && \ - rm -rf /usr/bin/pip && \ - ln -s /usr/bin/python3 /usr/bin/python && \ - ln -s /usr/bin/pip3 /usr/bin/pip + rm -rf /usr/bin/pip && \ + 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 @@ -37,12 +37,12 @@ RUN mkdir /opt/build && cd /opt/build && \ wget -O gcc-arm-none-eabi $ARMBINURL && \ mkdir armbin && \ tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin - + #Set environment variable so compiler knows where the toolchain lives ENV PATH=$PATH:/opt/build/armbin/bin CMD cd /havocsrc && \ - mkdir build && cd build && \ - cmake .. && make firmware && \ - cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin + mkdir build && cd build && \ + cmake .. && make firmware && \ + cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin diff --git a/dockerfile-nogit b/dockerfile-nogit index b317a834..a48a5522 100644 --- a/dockerfile-nogit +++ b/dockerfile-nogit @@ -21,7 +21,7 @@ RUN curl https://bootstrap.pypa.io/pip/3.4/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 + ln -s /usr/bin/pip3 /usr/bin/pip ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 @@ -38,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