Add rustup to docs and release images

naev · Dec 31, 2024 · 3333e8c · 3333e8c
1 parent 2f077f6
commit 3333e8c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/naev-docs/Dockerfile b/naev-docs/Dockerfile
@@ -8,14 +8,16 @@ LABEL org.opencontainers.image.description "Used for building website and docs."
 ENV IMAGE_NAME "naev-docs"
 
 # Install utilities
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install cargo make meson ninja-build gcc git GraphicsMagick libyaml openssl optipng rust zlib \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make meson ninja-build gcc git GraphicsMagick libyaml openssl optipng rustup zlib \
     python3-pyyaml rsync tidy tar unzip xz zip \
 # Install ldoc
     lua-ldoc \
 # Install LaTeX packages
     latexmk texlive-luahbtex texlive-roboto texlive-preprint texlive-parskip texlive-sfmath \
     texlive-markdown texlive-csvsimple texlive-gobble texlive-microtype texlive-minted texlive-newunicodechar && \
     microdnf clean all && \
+# Install rust toolchain
+    rustup-init -y --default-toolchain stable && \
 # Verify tool versions and install locations.
     echo "Verifying latexmk install" && \
     command -v latexmk && \
@@ -25,7 +27,9 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install cargo make meson n
     lualatex -v && \
     echo "Verifying ldoc install" && \
     command -v ldoc
-
+
+# Add rust toolchain to PATH
+ENV PATH=/root/.cargo/bin:$PATH
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1
 

diff --git a/naev-release/Dockerfile b/naev-release/Dockerfile
@@ -39,10 +39,12 @@ ENV PATH "$PATH:/opt/apple-codesign"
 
 WORKDIR /tmp
 # Install utilities
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install cargo meson ninja-build gcc python3-pyyaml file git readline-devel rust tar xz unzip zip \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build gcc python3-pyyaml file git readline-devel rustup tar xz unzip zip \
 # Install SteamCMD and friends
     glibc.i686 SDL2.i686 && \
     microdnf clean all && \
+# Install rust toolchain
+    rustup-init -y --default-toolchain stable && \
 # Download and install SteamCMD
     curl -L -O http://media.steampowered.com/installer/steamcmd_linux.tar.gz && \
     mkdir -p /opt/steamcmd && \
@@ -75,6 +77,8 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install cargo meson ninja-
     command -v github-assets-uploader && \
     github-assets-uploader -version
 
+# Add rust toolchain to PATH
+ENV PATH=/root/.cargo/bin:$PATH
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1