From d85f731478211c3952114247807eb424bb400b62 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 15 Nov 2022 15:22:53 +0000 Subject: [PATCH] build: update toolchain to Fedora 37 with clang 15 'cargo' instantiation now overrides internal git client with cli client due to unbounded memory usage [1]. [1] https://github.com/rust-lang/cargo/issues/10583#issuecomment-1129997984 --- install-dependencies.sh | 2 +- tools/toolchain/Dockerfile | 2 +- tools/toolchain/image | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install-dependencies.sh b/install-dependencies.sh index 92ca73de4e..f9ff0264e4 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -314,7 +314,7 @@ elif [ "$ID" = "fedora" ]; then pip3 install "$PIP_DEFAULT_ARGS" traceback-with-variables pip3 install "$PIP_DEFAULT_ARGS" scylla-api-client - cargo install cxxbridge-cmd --root /usr/local + cargo --config net.git-fetch-with-cli=true install cxxbridge-cmd --root /usr/local if [ -f "$(node_exporter_fullpath)" ] && node_exporter_checksum; then echo "$(node_exporter_filename) already exists, skipping download" else diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile index 6c50d45f80..38d95d93d1 100644 --- a/tools/toolchain/Dockerfile +++ b/tools/toolchain/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/fedora:34 +FROM docker.io/fedora:37 ADD ./install-dependencies.sh ./ ADD ./seastar/install-dependencies.sh ./seastar/ ADD ./tools/jmx/install-dependencies.sh ./tools/jmx/ diff --git a/tools/toolchain/image b/tools/toolchain/image index 90af402175..d8c229f7ae 100644 --- a/tools/toolchain/image +++ b/tools/toolchain/image @@ -1 +1 @@ -docker.io/scylladb/scylla-toolchain:fedora-34-20221102 \ No newline at end of file +docker.io/scylladb/scylla-toolchain:fedora-37-20221115 \ No newline at end of file