Skip to content

Commit

Permalink
Only pip meson in steamruntime, not linux-latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbens committed Apr 28, 2024
1 parent 1a241ab commit 9c9f2df
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 3 additions & 5 deletions naev-linux-latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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 && \
Expand Down
8 changes: 5 additions & 3 deletions naev-steamruntime/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -44,14 +44,16 @@ 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 && \
python3 --version && \
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

Expand Down

0 comments on commit 9c9f2df

Please sign in to comment.