From d9bc542b0618757e846bc63e5300c49dd8c6cd75 Mon Sep 17 00:00:00 2001 From: "E.T." Date: Mon, 25 Nov 2024 09:19:43 +0100 Subject: [PATCH] Upgrade build container (#2394) * Upgrade build container os version * Also updare the arm build container --- dockerfile-nogit | 13 ++----------- dockerfile-nogit-arm | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dockerfile-nogit b/dockerfile-nogit index d2f5f84d..916e510c 100644 --- a/dockerfile-nogit +++ b/dockerfile-nogit @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:noble # Set location to download ARM toolkit from. # This will need to be changed over time or replaced with a static link to the latest release. @@ -11,19 +11,10 @@ WORKDIR /havoc/firmware # Fetch dependencies from APT RUN apt-get update \ - && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \ + && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \ && apt-get -qy autoremove \ && rm -rf /var/lib/apt/lists/* -#Install current pip from PyPa -RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \ - python3 get-pip.py - -#Fetch additional dependencies from Python 3.x pip -RUN pip install pyyaml \ - && 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 diff --git a/dockerfile-nogit-arm b/dockerfile-nogit-arm index b5431ade..b4421c8d 100644 --- a/dockerfile-nogit-arm +++ b/dockerfile-nogit-arm @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:noble # Set location to download ARM toolkit from. # This will need to be changed over time or replaced with a static link to the latest release. @@ -11,19 +11,10 @@ WORKDIR /havoc/firmware # Fetch dependencies from APT RUN apt-get update \ - && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \ + && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \ && apt-get -qy autoremove \ && rm -rf /var/lib/apt/lists/* -#Install current pip from PyPa -RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \ - python3 get-pip.py - -#Fetch additional dependencies from Python 3.x pip -RUN pip install pyyaml \ - && 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