From fc9b27f212c0e5f2c78cbc6b2a23022a2fc564cc Mon Sep 17 00:00:00 2001 From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:13:05 -0700 Subject: [PATCH] Linux: Fix reproducible build for ubuntu 20 --- reproducible-builds/Dockerfile | 8 ++++++-- reproducible-builds/docker/sources.list | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index a2c6c1ebd..f995d9376 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230624@sha256:b060fffe8e1561c9c3e6dea6db487b900100fc26830b9ea2ec966c151ab4c020 +FROM ubuntu:focal-20240530@sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e # Allows package builders like FPM (used for creating the .deb package # on linux) to make their build timestamps determistic. Otherwise, a fresh @@ -30,7 +30,11 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates # Back to normal, verification back on RUN apt update -RUN apt install -y git curl g++ gcc make python3 tar +RUN apt install -y git curl g++ g++-10 gcc gcc-10 make python3 tar + +# On Ubuntu 20 GCC 9 is the default but we need 10 to build +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-10 # --- # Install nvm diff --git a/reproducible-builds/docker/sources.list b/reproducible-builds/docker/sources.list index 13c9ed69f..150fe17fd 100644 --- a/reproducible-builds/docker/sources.list +++ b/reproducible-builds/docker/sources.list @@ -1,3 +1,3 @@ -deb http://mirror.signalusers.org/ubuntu/1687461439/ jammy main universe -deb http://mirror.signalusers.org/ubuntu/1687461439/ jammy-security main universe -deb http://mirror.signalusers.org/ubuntu/1687461439/ jammy-updates main universe \ No newline at end of file +deb [snapshot=20240829T060900Z] http://archive.ubuntu.com/ubuntu/ focal main universe +deb [snapshot=20240829T060900Z] http://archive.ubuntu.com/ubuntu/ focal-updates main universe +deb [snapshot=20240829T060900Z] http://security.ubuntu.com/ubuntu focal-security main universe \ No newline at end of file