From d8a1c1600d392903dfcedddf017b504f3781e0c1 Mon Sep 17 00:00:00 2001 From: Humberto Dias Date: Sat, 17 Feb 2024 01:37:56 -0300 Subject: [PATCH] Upgrading to ubuntu 24.04 LTS --- Dockerfile | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index d635a23..6daa01b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,25 @@ -FROM ubuntu:14.04 +FROM ubuntu:24.04 MAINTAINER Mathias Lafeldt -ENV TOOLCHAIN_VERSION 78cea97c5a1464db965f205d3ec07a5ad649c88a +ENV TOOLCHAIN_VERSION 0359891a9e65785a12fab0b0f9479d81f0d146b0 ENV PS3DEV /ps3dev ENV PSL1GHT $PS3DEV -ENV PATH $PATH:$PS3DEV/bin:$PS3DEV/ppu/bin:$PS3DEV/spu/bin +ENV PATH $PATH:$PS3DEV/bin:$PS3DEV/ppu/bin:$PS3DEV/spu/bin:${PS3DEV}/portlibs/ppu/bin ENV DEBIAN_FRONTEND noninteractive COPY toolchain-docker.sh / -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y \ +RUN apt update \ + && apt upgrade -y \ + && apt install -y \ autoconf \ automake \ bison \ bzip2 \ + ca-certificates \ flex \ g++ \ gcc \ @@ -28,17 +29,24 @@ RUN apt-get update \ libncurses5-dev \ libssl-dev \ libtool \ + libtool-bin \ make \ patch \ pkg-config \ - python-dev \ + python-dev-is-python3 \ texinfo \ vim \ wget \ - zlib1g-dev \ + xz-utils \ + zlib1g-dev + +# Fixes certificate errors with letsencrypt in ARMv7 +RUN echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" >> /etc/wgetrc \ + && echo "check_certificate = off" >> ~/.wgetrc + # pass toolchain's check for gmp - && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \ - && git clone git://github.com/ps3dev/ps3toolchain.git /toolchain \ +RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \ + && git clone https://github.com/ps3dev/ps3toolchain.git /toolchain \ && cd /toolchain \ && git checkout -qf $TOOLCHAIN_VERSION \ && /toolchain-docker.sh \