Browse Source

[FL-1743] CI: Upgrade base Docker image (#676)

* CI: Upgrade base Docker image
* Docker: update toolchain to 2021.07

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Anna Prosvetova 4 years ago
parent
commit
8b9210704a
1 changed files with 6 additions and 6 deletions
  1. 6 6
      docker/Dockerfile

+ 6 - 6
docker/Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:focal
+FROM ubuntu:hirsute
 
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         ca-certificates \
         ca-certificates \
         build-essential \
         build-essential \
         python3 \
         python3 \
-        python-lxml \
+        python3-lxml \
         git \
         git \
         clang-format-12 \
         clang-format-12 \
         dfu-util \
         dfu-util \
@@ -14,10 +14,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
         wget && \
         wget && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
-RUN wget --progress=dot:giga "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-$(uname -m)-linux.tar.bz2" && \
-    tar xjf gcc-arm-none-eabi-10-2020-q4-major-$(uname -m)-linux.tar.bz2 && \
-    rm gcc-arm-none-eabi-10-2020-q4-major-$(uname -m)-linux.tar.bz2 && \
-    cd gcc-arm-none-eabi-10-2020-q4-major/bin/ && \
+RUN wget --progress=dot:giga "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.07/gcc-arm-none-eabi-10.3-2021.07-$(uname -m)-linux.tar.bz2" && \
+    tar xjf gcc-arm-none-eabi-10.3-2021.07-$(uname -m)-linux.tar.bz2 && \
+    rm gcc-arm-none-eabi-10.3-2021.07-$(uname -m)-linux.tar.bz2 && \
+    cd gcc-arm-none-eabi-10.3-2021.07/bin/ && \
     rm -rf ../share && \
     rm -rf ../share && \
     for file in * ; do ln -s "${PWD}/${file}" "/usr/bin/${file}" ; done && \
     for file in * ; do ln -s "${PWD}/${file}" "/usr/bin/${file}" ; done && \
     cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v
     cd / && arm-none-eabi-gcc -v && arm-none-eabi-gdb -v