From 9c9f2df08b63ef1e5d439ec5e6663a7fbdaa4aef Mon Sep 17 00:00:00 2001 From: Edgar Simo-Serra Date: Sun, 28 Apr 2024 14:01:36 +0900 Subject: [PATCH] Only pip meson in steamruntime, not linux-latest. --- naev-linux-latest/Dockerfile | 8 +++----- naev-steamruntime/Dockerfile | 8 +++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/naev-linux-latest/Dockerfile b/naev-linux-latest/Dockerfile index 3f4fffd..98bcd63 100644 --- a/naev-linux-latest/Dockerfile +++ b/naev-linux-latest/Dockerfile @@ -1,5 +1,5 @@ # Build luarocks in build container to save space. -FROM registry.fedoraproject.org/fedora-minimal:latest AS build +FROM registry.fedoraproject.org/fedora-minimal:latest AS build WORKDIR /tmp # Install luarocks deps @@ -28,7 +28,7 @@ LABEL org.opencontainers.image.description "Used for CI, testing and soundtrack ENV IMAGE_NAME "naev-linux-latest" WORKDIR / -COPY --from=build /opt/luarocks /opt/luarocks +COPY --from=build /opt/luarocks /opt/luarocks # Add luarocks to PATH ENV PATH "$PATH:/opt/luarocks/bin" @@ -39,9 +39,7 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build luajit-devel openal-soft-devel openblas-devel pcre2-devel physfs-devel SDL2-devel SDL2_image-devel suitesparse-devel \ # Install utilities git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar texinfo xz unzip zip && \ - microdnf clean all && \ -# Need Meson >=1.2.0 for fancy wrap files. - python3 -m pip install meson --upgrade + microdnf clean all # Verify tool versions and install locations. echo "Verifying python install" && \ command -v python3 && \ diff --git a/naev-steamruntime/Dockerfile b/naev-steamruntime/Dockerfile index d778647..0adec05 100644 --- a/naev-steamruntime/Dockerfile +++ b/naev-steamruntime/Dockerfile @@ -1,5 +1,5 @@ # Build dependencies in build container to save space. -FROM registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest AS build +FROM registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest AS build WORKDIR /tmp RUN mkdir -p /opt @@ -26,7 +26,7 @@ RUN curl -L -O http://enet.bespin.org/download/enet-1.3.17.tar.gz && \ cd enet-1.3.17 && \ ./configure --prefix=/opt && \ make -j"$(nproc --all)" && \ - make PREFIX=/opt install + make PREFIX=/opt install FROM registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest @@ -44,6 +44,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ # Naughty: we need libluajit-5.1-dev, libglpk-dev and libsuitesparse-dev, not in the SDK.... All are statically linked when building with the steamruntime option in meson set to true. Also, texinfo is an accidental build dependency for libbfd. libluajit-5.1-dev libglpk-dev libsuitesparse-dev texinfo && \ apt-get clean && \ +# Need Meson >=1.2.0 for fancy wrap files. + python3 -m pip install meson --upgrade && \ # Verify meson and python. echo "Verifying python install" && \ command -v python3 && \ @@ -51,7 +53,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ echo "Verifying meson install" && \ command -v meson && \ meson --version - + # Force appimages to run in extract mode since FUSE is not available ENV APPIMAGE_EXTRACT_AND_RUN 1