Upgrade build container (#2394)

* Upgrade build container os version

* Also updare the arm build container
This commit is contained in:
E.T. 2024-11-25 09:19:43 +01:00 committed by GitHub
parent 3dcfa4f8c1
commit d9bc542b06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 22 deletions

View File

@ -1,4 +1,4 @@
FROM ubuntu:xenial FROM ubuntu:noble
# Set location to download ARM toolkit from. # 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. # 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 # Fetch dependencies from APT
RUN apt-get update \ 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 \ && apt-get -qy autoremove \
&& rm -rf /var/lib/apt/lists/* && 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 LANG C.UTF-8
ENV LC_ALL C.UTF-8 ENV LC_ALL C.UTF-8

View File

@ -1,4 +1,4 @@
FROM ubuntu:xenial FROM ubuntu:noble
# Set location to download ARM toolkit from. # 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. # 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 # Fetch dependencies from APT
RUN apt-get update \ 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 \ && apt-get -qy autoremove \
&& rm -rf /var/lib/apt/lists/* && 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 LANG C.UTF-8
ENV LC_ALL C.UTF-8 ENV LC_ALL C.UTF-8