Skip to content

Commit 41dacc4

Browse files
committed
Move out rust version to build variables
1 parent 2d9fc66 commit 41dacc4

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

docker/debian/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ rm -rf awscli.zip aws
9797
EOF
9898

9999
# Install rust.
100+
ARG RUST_VERSION
100101
RUN <<EOF
101-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.91.1
102+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
102103
EOF
103104

104105
# Print versions.

docker/debian/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ CONAN_VERSION=2.22.2
4242
GCOVR_VERSION=8.3
4343
CMAKE_VERSION=4.1.0
4444
MOLD_VERSION=2.40.4
45+
RUST_VERSION=1.91.1
4546
CONTAINER_IMAGE=ghcr.io/xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
4647

4748
docker buildx build . \
@@ -55,6 +56,7 @@ docker buildx build . \
5556
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
5657
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
5758
--build-arg MOLD_VERSION=${MOLD_VERSION} \
59+
--build-arg RUST_VERSION=${RUST_VERSION} \
5860
--tag ${CONTAINER_IMAGE}
5961
```
6062

@@ -68,6 +70,7 @@ CONAN_VERSION=2.22.2
6870
GCOVR_VERSION=8.3
6971
CMAKE_VERSION=4.1.0
7072
MOLD_VERSION=2.40.4
73+
RUST_VERSION=1.91.1
7174
BASE_IMAGE=ghcr.io/xrplf/ci/gcc:12-bullseye
7275
CONTAINER_IMAGE=ghcr.io/xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
7376

@@ -82,6 +85,7 @@ docker buildx build . \
8285
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
8386
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
8487
--build-arg MOLD_VERSION=${MOLD_VERSION} \
88+
--build-arg RUST_VERSION=${RUST_VERSION} \
8589
--build-arg BASE_IMAGE=${BASE_IMAGE} \
8690
--tag ${CONTAINER_IMAGE}
8791
```
@@ -98,6 +102,7 @@ CONAN_VERSION=2.22.2
98102
GCOVR_VERSION=8.3
99103
CMAKE_VERSION=4.1.0
100104
MOLD_VERSION=2.40.4
105+
RUST_VERSION=1.91.1
101106
CONTAINER_IMAGE=ghcr.io/xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
102107

103108
docker buildx build . \
@@ -111,6 +116,7 @@ docker buildx build . \
111116
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
112117
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
113118
--build-arg MOLD_VERSION=${MOLD_VERSION} \
119+
--build-arg RUST_VERSION=${RUST_VERSION} \
114120
--tag ${CONTAINER_IMAGE}
115121
```
116122

docker/rhel/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ rm -rf awscli.zip aws
111111
EOF
112112

113113
# Install rust.
114+
ARG RUST_VERSION
114115
RUN <<EOF
115-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.91.1
116+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
116117
EOF
117118

118119
# Print versions.

docker/rhel/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONAN_VERSION=2.22.2
2929
GCOVR_VERSION=8.3
3030
CMAKE_VERSION=4.1.0
3131
MOLD_VERSION=2.40.4
32+
RUST_VERSION=1.91.1
3233
CONTAINER_IMAGE=ghcr.io/xrplf/ci/rhel-${RHEL_VERSION}:gcc-${GCC_VERSION}
3334

3435
docker buildx build . \
@@ -41,6 +42,7 @@ docker buildx build . \
4142
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
4243
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
4344
--build-arg MOLD_VERSION=${MOLD_VERSION} \
45+
--build-arg RUST_VERSION=${RUST_VERSION} \
4446
--build-arg RHEL_VERSION=${RHEL_VERSION} \
4547
--tag ${CONTAINER_IMAGE}
4648
```
@@ -56,6 +58,7 @@ CONAN_VERSION=2.22.2
5658
GCOVR_VERSION=8.3
5759
CMAKE_VERSION=4.1.0
5860
MOLD_VERSION=2.40.4
61+
RUST_VERSION=1.91.1
5962
CONTAINER_IMAGE=ghcr.io/xrplf/ci/rhel-${RHEL_VERSION}:clang-any
6063

6164
docker buildx build . \
@@ -67,6 +70,7 @@ docker buildx build . \
6770
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
6871
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
6972
--build-arg MOLD_VERSION=${MOLD_VERSION} \
73+
--build-arg RUST_VERSION=${RUST_VERSION} \
7074
--build-arg RHEL_VERSION=${RHEL_VERSION} \
7175
--tag ${CONTAINER_IMAGE}
7276
```

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ rm -rf awscli.zip aws
8383
EOF
8484

8585
# Install rust.
86+
ARG RUST_VERSION
8687
RUN <<EOF
87-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.91.1
88+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
8889
EOF
8990

9091
# Print versions.

docker/ubuntu/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CONAN_VERSION=2.22.2
2828
GCOVR_VERSION=8.3
2929
CMAKE_VERSION=4.1.0
3030
MOLD_VERSION=2.40.4
31+
RUST_VERSION=1.91.1
3132
CONTAINER_IMAGE=ghcr.io/xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc-${GCC_VERSION}
3233

3334
docker buildx build . \
@@ -40,6 +41,7 @@ docker buildx build . \
4041
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
4142
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
4243
--build-arg MOLD_VERSION=${MOLD_VERSION} \
44+
--build-arg RUST_VERSION=${RUST_VERSION} \
4345
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
4446
--tag ${CONTAINER_IMAGE}
4547
```
@@ -56,6 +58,7 @@ CONAN_VERSION=2.22.2
5658
GCOVR_VERSION=8.3
5759
CMAKE_VERSION=4.1.0
5860
MOLD_VERSION=2.40.4
61+
RUST_VERSION=1.91.1
5962
CONTAINER_IMAGE=ghcr.io/xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
6063

6164
docker buildx build . \
@@ -68,6 +71,7 @@ docker buildx build . \
6871
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
6972
--build-arg CMAKE_VERSION=${CMAKE_VERSION} \
7073
--build-arg MOLD_VERSION=${MOLD_VERSION} \
74+
--build-arg RUST_VERSION=${RUST_VERSION} \
7175
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
7276
--tag ${CONTAINER_IMAGE}
7377
```

0 commit comments

Comments
 (0)