NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install Rust before Ruby

Browse source 
Ruby needs to have rustc available for YJIT to be used.
This commit is contained in:
Stan Hu 2023-01-18 14:25:50 -08:00
parent bc3223ac21
commit a5ac3f8e7f
No known key found for this signature in database
GPG key ID: 8D3931AD39CC7A20
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.custom
View file

@ -19,6 +19,11 @@ ENV PATH $PATH:/usr/local/go/bin
ENV PATH /usr/local/cargo/bin:$PATH
# Rust
ARG INSTALL_RUST_VERSION
RUN if [ -n "$INSTALL_RUST_VERSION" ] ; then /scripts/install-rust "${INSTALL_RUST_VERSION}" && rustc version; fi
# Ruby
ARG RUBY_VERSION
ARG RUBY_DOWNLOAD_SHA256
@ -52,11 +57,6 @@ ARG GOLANG_DOWNLOAD_SHA256
RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTALL_GOLANG_VERSION}" "${GOLANG_DOWNLOAD_SHA256}" && go version; fi
# Rust
ARG INSTALL_RUST_VERSION
RUN if [ -n "$INSTALL_RUST_VERSION" ] ; then /scripts/install-rust "${INSTALL_RUST_VERSION}" && rustc version; fi
# Git LFS (https://git-lfs.github.com/)
ARG LFS_VERSION
ARG LFS_DOWNLOAD_SHA256