From 80807f47ae266e324514d41c00e7c8ce22c0addc Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Thu, 31 Jul 2025 10:47:36 -0400 Subject: [PATCH] Fix dockerfile. It was broken because the practicerom package changed stuff and apt didn't like whatever changed. This is the commit that seems to have broken how the old practicerom package worked: https://github.com/glankk/n64/commit/e7bec93b0b11b37a63abcf5ac28728f2fcd4045b#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5 --- Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a75375f88c..0c6e3859ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,15 @@ FROM ubuntu:24.04 AS build ENV TZ=UTC ENV LANG=C.UTF-8 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# Add source for practicerom-dev install +RUN apt-get update && apt-get install -y curl && \ + curl -o /etc/apt/trusted.gpg.d/practicerom.gpg https://practicerom.com/public/packages/practicerom.gpg && \ + echo 'deb [arch=amd64] http://practicerom.com/public/packages/debian unstable main' > /etc/apt/sources.list.d/practicerom.list + # Install Required Dependencies -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ - apt-get update && apt-get install -y \ - curl \ +RUN apt-get update && apt-get install -y \ build-essential \ binutils-mips-linux-gnu \ pkg-config \ @@ -20,12 +25,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone & vim \ clang-tidy-14 \ clang-format-14 \ - libpng-dev && \ - # Add source for practicerom-dev install - curl https://practicerom.com/public/packages/debian/pgp.pub | apt-key add - && \ - echo deb http://practicerom.com/public/packages/debian staging main >/etc/apt/sources.list.d/practicerom.list && \ - apt-get update && \ - apt-get install -y \ + libpng-dev \ practicerom-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*