Skip to content

Commit 256eaff

Browse files
committed
feat: use rustup to install rust
1 parent 78f9c14 commit 256eaff

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

focal-arm64/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3737
gnupg \
3838
unzip \
3939
# VSCodium
40-
jq \
41-
cargo
40+
jq
4241

4342
# Disable user so it can run on GH (VSCodium)
4443
# # No Sudo Prompt
@@ -54,6 +53,9 @@ RUN curl --silent --location https://deb.nodesource.com/setup_20.x | sudo -E bas
5453
RUN apt-get update && apt-get install -y nodejs
5554
RUN npm install -g npm@latest node-gyp yarn
5655

56+
# Rust
57+
RUN curl https://sh.rustup.rs -sSf | sudo -E bash -
58+
5759
# Install docker client
5860
RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
5961
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg

focal-armhf/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3737
gnupg \
3838
unzip \
3939
# VSCodium
40-
jq \
41-
cargo
40+
jq
4241

4342
# Disable user so it can run on GH (VSCodium)
4443
# # No Sudo Prompt
@@ -54,6 +53,9 @@ RUN curl --silent --location https://deb.nodesource.com/setup_20.x | sudo -E bas
5453
RUN apt-get update && apt-get install -y nodejs
5554
RUN npm install -g npm@latest node-gyp yarn
5655

56+
# Rust
57+
RUN curl https://sh.rustup.rs -sSf | sudo -E bash -
58+
5759
# Install docker client
5860
RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
5961
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg

focal-x64/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ RUN apt-get update && apt-get install -y \
5555
imagemagick \
5656
gcc-10 \
5757
g++-10 \
58-
cargo \
5958
&& curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.sh\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.sh \
6059
&& curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.py\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.py \
6160
# Remove snapcraft to avoid issues on docker build
@@ -79,6 +78,9 @@ RUN npm install -g npm@latest node-gyp yarn
7978
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
8079
RUN python --version
8180

81+
# Rust
82+
RUN curl https://sh.rustup.rs -sSf | sudo -E bash -
83+
8284
# Install docker client
8385
RUN sudo mkdir -m 0755 -p /etc/apt/keyrings
8486
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg

0 commit comments

Comments
 (0)