Added SteamCMD and itch.io butler.

Author: ProjectSynchro

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v1.4.5
+Added [SteamCMD](https://developer.valvesoftware.com/wiki/SteamCMD) and [itch.io butler](https://itch.io/docs/butler/) to `naev-linux-latest` and `naev-linux-lts` images. (Available on PATH)
+
 ### v1.4.4
 Set APPIMAGE_EXTRACT_AND_RUN to 1 in the naev-steamruntime image.
 

naev/naev-linux-latest/Dockerfile

@@ -5,17 +5,43 @@ LABEL org.opencontainers.image.source "https://github.com/ProjectSynchro/synchro
 LABEL org.opencontainers.image.description "Naev Linux (Latest) development/testing environment for Naev (For CI and testing)"
 
 # Enable RPMFusion for additional up-to-date tools.
-RUN dnf -y --nogpgcheck install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
 
 # Install Build dependencies and utilities.
-RUN dnf -y --nogpgcheck groupinstall "Development Tools"
+RUN dnf -y groupinstall "Development Tools"
 
-RUN dnf -y --nogpgcheck install gettext-devel autoconf-archive binutils-devel \
+RUN dnf -y install gettext-devel autoconf-archive binutils-devel \
     doxygen clang cmake ffmpeg git graphviz intltool lldb llvm freetype-devel luajit-devel \
     openal-soft-devel libpng-devel lua-ldoc SDL2-devel SDL2_image-devel SDL2_mixer-devel libvorbis-devel \
     libxml2-devel meson mesa-libGLU-devel nano ninja-build physfs-devel python-mutagen \
     suitesparse-devel tidy vim wget xorg-x11-server-Xvfb
 
+# Install SteamCMD and friends
+RUN dnf -y install glibc.i686 libstdc++.i686 SDL2.i686
+
+WORKDIR /tmp
+RUN wget http://media.steampowered.com/installer/steamcmd_linux.tar.gz && \
+    mkdir -p /opt/steamcmd && \
+    tar -xvzf steamcmd_linux.tar.gz -C /opt/steamcmd
+
+WORKDIR /opt/steamcmd
+RUN mv steam.sh steam && mv steamcmd.sh steamcmd
+
+# Add SteamCMD to PATH
+ENV PATH "$PATH:/opt/steamcmd"
+
+# Install itch.io butler
+WORKDIR /tmp
+RUN wget https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default -O butler.zip && \
+    mkdir -p /opt/butler && \
+    unzip butler.zip -d /opt/butler
+
+WORKDIR /opt/butler
+RUN chmod +x butler
+
+# Add Butler to PATH
+ENV PATH "$PATH:/opt/butler"
+
 # Install Ruby and Rubygems packages
 RUN dnf -y --nogpgcheck install redhat-rpm-config ruby-devel rubygem-bundler rubygem-json rubygem-ffi rubygem-racc
 
@@ -39,6 +65,16 @@ RUN echo "Verifying meson install" && \
     which meson && \
     meson --version
 
+# Verify SteamCMD version and installation.
+RUN echo "Verifying steamcmd install" && \
+    which steamcmd && \
+    steamcmd +quit
+
+# Verify Butler version and installation.
+RUN echo "Verifying butler install" && \
+    which butler && \
+    butler -V
+
 # Clone naev-website git repository
 WORKDIR /tmp
 RUN git clone https://github.com/naev/naev-website.git
@@ -49,7 +85,9 @@ RUN bundle install -j"$(nproc --all)"
 
 # Cleanup dnf cache
 RUN dnf clean all && \
-    rm -rf /tmp/naev-website
+    rm -rf /tmp/naev-website && \
+    rm /tmp/butler.zip && \
+    rm /tmp/steamcmd_linux.tar.gz
 
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1

naev/naev-linux-lts/Dockerfile

@@ -22,6 +22,32 @@ RUN yum install -y gettext-devel autoconf-archive binutils-devel \
 # Install ldoc from luarocks
 RUN luarocks install ldoc
 
+# Install SteamCMD and friends
+RUN yum install -y glibc.i686 libstdc++.i686 SDL2.i686
+
+WORKDIR /tmp
+RUN wget http://media.steampowered.com/installer/steamcmd_linux.tar.gz && \
+    mkdir -p /opt/steamcmd && \
+    tar -xvzf steamcmd_linux.tar.gz -C /opt/steamcmd
+
+WORKDIR /opt/steamcmd
+RUN mv steam.sh steam && mv steamcmd.sh steamcmd
+
+# Add SteamCMD to PATH
+ENV PATH "$PATH:/opt/steamcmd"
+
+# Install itch.io butler
+WORKDIR /tmp
+RUN wget https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default -O butler.zip && \
+    mkdir -p /opt/butler && \
+    unzip butler.zip -d /opt/butler
+
+WORKDIR /opt/butler
+RUN chmod +x butler
+
+# Add Butler to PATH
+ENV PATH "$PATH:/opt/butler"
+
 # Verify python version and install location.
 RUN echo "Verifying python install" && \
     which python3 && \
@@ -33,12 +59,24 @@ RUN echo "Verifying meson install" && \
     meson --version
 
 # Verify git version and installation.
-RUN echo "Verifying meson install" && \
+RUN echo "Verifying git install" && \
     which git && \
     git --version
 
-# Cleanup yum cache
-RUN yum clean all
+# Verify SteamCMD version and installation.
+RUN echo "Verifying steamcmd install" && \
+    which steamcmd && \
+    steamcmd +quit
+
+# Verify Butler version and installation.
+RUN echo "Verifying butler install" && \
+    which butler && \
+    butler -V
+    
+# Cleanup yum cache and utility temp files
+RUN yum clean all && \
+    rm /tmp/butler.zip && \
+    rm /tmp/steamcmd_linux.tar.gz
 
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1