From 798f1cdcb09db658476fa2d5ac56de29598d5c4b Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Sun, 15 Jun 2025 11:13:47 -0400 Subject: [PATCH] fulyl revert it --- docker/Dockerfile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0e5b40f33..b12397353 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -58,24 +58,23 @@ FROM backend-build AS backend-dev-build RUN poetry install --no-ansi --no-cache --all-extras -FROM alpine:${ALPINE_VERSION} AS rahasher-build +# TODO: Upgrade Alpine to the same version as the other stages, when RAHasher is updated to workAdd commentMore actions +# with it (seems like Alpine 3.18's g++ v12 is the latest version that works with RAHasher, +# while g++ v13 fails to compile it). +FROM alpine:3.18 AS rahasher-build RUN apk add --no-cache \ g++ \ git \ - make \ linux-headers \ + make \ zlib-dev -# TODO: Move to a tagged release of `RALibretro`, once a version newer than 1.8.0 is released. ARG RALIBRETRO_VERSION=1.8.0 -# TODO: Remove `sed` command adding "ctime", when RAHasher can be compiled without it. -# TODO: Remove `sed` command adding "unistd.h", when RAHasher can be compiled without it. -# Related pull request: https://github.com/madler/zlib/pull/1022 -RUN git clone --recursive https://github.com/RetroAchievements/RALibretro.git && \ + +# TODO: Remove `sed` command when RAHasher can be compiled without it. +RUN git clone --recursive --branch "${RALIBRETRO_VERSION}" --depth 1 https://github.com/RetroAchievements/RALibretro.git && \ cd ./RALibretro && \ - git checkout "${RALIBRETRO_VERSION}" && \ - git submodule update --init --recursive && \ sed -i '22a #include ' ./src/Util.h && \ make HAVE_CHD=1 -f ./Makefile.RAHasher