diff --git a/docker/Dockerfile b/docker/Dockerfile index 547c2bc3..806535ce 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal ca-certificates \ build-essential \ python3 \ - python3-lxml \ + python-setuptools \ + libpython2.7 \ git \ clang-format-12 \ dfu-util \ @@ -22,6 +23,9 @@ RUN wget --progress=dot:giga "https://developer.arm.com/-/media/Files/downloads/ for file in * ; do ln -s "${PWD}/${file}" "/usr/bin/${file}" ; done && \ cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v +RUN wget --progress=dot:giga -O - https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2 && \ + pip install --no-cache-dir lxml==4.6.3 + RUN git clone https://github.com/rusdacent/hex2dfu.git && \ cd hex2dfu && gcc hex2dfu.c ED25519/*.c -o hex2dfu && mv ./hex2dfu /usr/local/bin/hex2dfu && \ hex2dfu -h diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 3693363e..4d553e0b 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,13 +1,5 @@ #!/bin/bash -# A hack for GitHub Actions to not install Rust twice -if [ "$HOME" != "/root" ]; then - ln -sf /root/.rustup "$HOME/.rustup" - ln -sf /root/.cargo "$HOME/.cargo" -fi - -PATH="$HOME/.cargo/bin:${PATH}" - if [ -z "$1" ]; then bash else