-
Notifications
You must be signed in to change notification settings - Fork 231
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
We originally pinned to 1.63 because that was the last version before Rust dropped support for older versions of `glibc` [in Rust 1.64][blog]. However, the relevant operating systems we were maintaining support for at that time (CentOS/RHEL 6) have now been end-of-life for three full years, so it seems reasonable to update to a more current version. Since no other changes to the `glibc` support have happened in the interval, we can safely update to the most current version of Rust. As part of this, update the RHEL 7 Dockerfile setup for building on Rust 1.74, including using updated versions of gcc and binutils. [blog]: https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html Co-authored-by: Rob Jackson <me@rwjblue.com>
- Loading branch information
1 parent
370f7a0
commit 1ddd380
Showing
6 changed files
with
16 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,16 @@ | ||
FROM cern/slc6-base | ||
FROM cern/cc7-base | ||
|
||
# This repo file references a URL that is no longer valid. It also isn't used by the build | ||
# toolchain, so we can safely remove it entirely | ||
RUN rm /etc/yum.repos.d/epel.repo | ||
|
||
# https://linux.web.cern.ch/centos7/docs/softwarecollections/#inst | ||
# Tools needed for the build and setup process | ||
RUN yum -y install wget tar | ||
# Fetch the repo information for the devtoolset repo | ||
RUN wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo | ||
# Install more recent GCC and binutils, to allow us to compile | ||
RUN yum -y install devtoolset-2-gcc devtoolset-2-binutils | ||
RUN yum install -y centos-release-scl | ||
# Install more recent GCC and binutils, to allow us to compile | ||
RUN yum install -y devtoolset-8 | ||
|
||
# Install Rust toolchain (need to do this manually since current rustup requires a more recent | ||
# glibc version than is available on RHEL/CentOS 6) | ||
RUN curl https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init -sSf -o ~/rustup-init | ||
RUN chmod +x ~/rustup-init | ||
RUN ~/rustup-init -y --default-toolchain 1.63 | ||
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y | ||
ENV PATH="/root/.cargo/bin:${PATH}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
[toolchain] | ||
channel = "1.63" | ||
channel = "1.74" | ||
components = ["clippy", "rustfmt"] | ||
profile = "minimal" |