diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 07:44:14 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 07:44:14 (GMT) |
| commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
| tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /docker | |
| parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index bc70999..a6caa24 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update -qq \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/*; RUN pip3 install adafruit-nrfutil +RUN pip3 install -Iv cryptography==3.3 # build.sh knows how to compile COPY build.sh /opt/ |