Less bs, less compiling from source, shiny.

What's not to like?

Author: ProjectSynchro

naev/naev-steamruntime/Dockerfile

@@ -1,73 +1,11 @@
-FROM registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest
+FROM registry.gitlab.steamos.cloud/steamrt/soldier/sdk:latest
 
 LABEL org.opencontainers.image.authors "Jack Greiner <[email protected]>" 
 LABEL org.opencontainers.image.source "https://github.com/ProjectSynchro/synchros-sexy-docker-containers" 
-LABEL org.opencontainers.image.description "Steam runtime development environment for Naev, various dependencies for testing meson and autotools as well as additional Naev functionality."
+LABEL org.opencontainers.image.description "Steam runtime (Soldier) development environment for Naev, various dependencies for testing meson and autotools as well as additional Naev functionality."
 
-# Add stable git PPA to sources, as well as the signing key to silence warnings
-RUN echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu precise main" | sudo tee -a /etc/apt/sources.list && \
-    echo "deb-src http://ppa.launchpad.net/git-core/ppa/ubuntu precise main" | sudo tee -a /etc/apt/sources.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
-
-# Install git, m4 macros (deprecated but still needed for 0.8.* releases), autopoint for autotools, and cpanminus to install the XML::Parser module
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    apt-get install -y --force-yes git autoconf-archive autopoint cpanminus 
-
-# Install perl module XML::Parser (Installing this via the package libxml-parser-perl throws us into dependency hell.)
-RUN cpanm XML::Parser --force
-
-# Install intltool (ditto on the dependency hell).
-WORKDIR /usr/src
-RUN curl "https://launchpadlibrarian.net/199705878/intltool-0.51.0.tar.gz" -o "intltool-0.51.0.tar.gz" && \
-    tar -xvf intltool-0.51.0.tar.gz && rm intltool-0.51.0.tar.gz
-
-WORKDIR /usr/src/intltool-0.51.0
-RUN ./configure --prefix=/usr && \
-    make install -j"$(nproc --all)"
-
-# Compile OpenSSL 1.0.2 from source (required for Python >=3.7).
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes checkinstall 
-
-WORKDIR /usr/local/src
-RUN curl "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz" -o "openssl-1.0.2u.tar.gz" && \
-    tar -xvf openssl-1.0.2u.tar.gz && rm openssl-1.0.2u.tar.gz
-
-WORKDIR /usr/local/src/openssl-1.0.2u
-RUN ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
-    make -j"$(nproc --all)" && \
-    make install
-
-WORKDIR /usr/local/ssl/bin
-RUN echo "Verifying openssl install" && \
-    which openssl && \
-    openssl version -a
-
-RUN echo "Directing local openssl to system certificates" && \
-    rmdir /usr/local/ssl/certs; \
-    ln -s /etc/ssl/certs /usr/local/ssl/certs
-
-# Compile Python 3.9.0 from source.
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes \
-    libreadline-dev libsqlite3-dev llvm tk-dev
-
-WORKDIR /usr/local/src
-RUN curl "https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz" -o "Python-3.9.0.tgz" && \
-    tar -xvf Python-3.9.0.tgz && rm Python-3.9.0.tgz
-
-WORKDIR /usr/local/src/Python-3.9.0
-RUN PATH="/usr/local/ssl:$PATH"  CPPFLAGS="-I/usr/local/ssl/include" CFLAGS="-I/usr/local/ssl/include/" \
-    LDFLAGS="-L/usr/local/ssl/lib -Wl,-rpath,/usr/local/ssl/lib" LD_LIBRARY_PATH=/usr/local/ssl/lib:$LD_LIBRARY_PATH \
-    LD_RUN_PATH="/usr/local/ssl/lib" CONFIGURE_OPTS="--with-openssl=/usr/local/ssl" PYTHON_CONFIGURE_OPTS="--enable-shared" \
-    ./configure --with-ensurepip=install && \
-    make -j"$(nproc --all)" && \
-    make altinstall
-
-RUN update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.9 1 && \
-    echo "Verifying python install" && \
-    which python3 && \
-    python3 --version
-
-# Update pip
+# Install pip from steam/debian repositories.
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip
 RUN python3 -m pip install --upgrade pip && \
     echo "Verifying python install" && \
     which python3 && \
@@ -78,8 +16,8 @@ RUN python3 -m pip install --upgrade pip && \
 # Install Mutagen for soundtrack generation via pip.
 RUN python3 -m pip install mutagen
 
-# Install meson via pip.
-RUN python3 -m pip install meson && \
+# Upgrade meson via pip.
+RUN python3 -m pip install meson --upgrade && \
     echo "Verifying meson install" && \
     which meson && \
     meson --version