Skip to content

Commit 5e3f123

Browse files
committed
containers: add rustup to Fedora containers
Add rustup to Fedora containers and initialize it in the dbus-broker CI. Signed-off-by: David Rheinsberg <david@readahead.eu>
1 parent acd302d commit 5e3f123

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

lib/containers/dbrk-ci-fedora.Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ ARG CAB_DNF_PACKAGES_ALT=""
4848
ARG CAB_DNF_GROUPS_ALT=""
4949
RUN ./tools/dnf.sh "${CAB_DNF_PACKAGES_ALT}" "${CAB_DNF_GROUPS_ALT}"
5050

51+
RUN rustup-init -y
52+
RUN rustup toolchain install nightly
53+
RUN rustup toolchain install stable
54+
RUN rustup component add --toolchain nightly rust-src
55+
RUN rustup component add --toolchain stable rust-src
56+
RUN rustup target add x86_64-unknown-linux-gnu
57+
RUN rustup target add i686-unknown-linux-gnu
58+
5159
RUN git config --system --add safe.directory '*'
5260

5361
RUN rm -rf /cab/tools

lib/containers/docker-bake.hcl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ target "virtual-ci-c-util" {
169169
"rpm-build",
170170
"rpmdevtools",
171171
"rust",
172+
"rustup",
172173
"sed",
173174
"strace",
174175
"sudo",
@@ -289,6 +290,7 @@ target "virtual-dbrk-ci-fedora" {
289290
"rpm-build",
290291
"rpmdevtools",
291292
"rust",
293+
"rustup",
292294
"sed",
293295
"strace",
294296
"sudo",
@@ -478,6 +480,7 @@ target "virtual-dbrk-fedora-base" {
478480
"procps-ng",
479481
"python3-docutils",
480482
"rust",
483+
"rustup",
481484
"strace",
482485
"sudo",
483486
"systemd",
@@ -561,6 +564,7 @@ target "virtual-fedpkg" {
561564
"rpm-build",
562565
"rpmdevtools",
563566
"rust",
567+
"rustup",
564568
"sed",
565569
"strace",
566570
"sudo",

0 commit comments

Comments
 (0)