Skip to content

Commit f5fba53

Browse files
authored
Changes to support Ubuntu 24.04 builds (#4932)
#4928 What * update docker building to support Ubuntu 24.04 # Why We need to start publishing 24.04 packages # Checklist - [x] Reviewed the [contributing](https://github.com/stellar/stellar-core/blob/master/CONTRIBUTING.md#submitting-changes) document - [x] Rebased on top of master (no merge commits) - [ ] Ran `clang-format` v8.0.0 (via `make format` or the Visual Studio extension) - [ ] Compiles - [ ] Ran all tests - [ ] If change impacts performance, include supporting evidence per the [performance document](https://github.com/stellar/stellar-core/blob/master/performance-eval/performance-eval.md)
2 parents 7b9e6c8 + 4f103e5 commit f5fba53

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

docker/setup

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,26 @@ export DEBIAN_FRONTEND=noninteractive
77
apt-get update
88

99
# We need apt-transport-https for adding apt.stellar.org in the Dockerfile
10-
apt-get install -y wget curl python-six python3-colorama python3-pip postgresql-client sqlite3 apt-transport-https gnupg2
10+
apt-get install -y wget curl python3-six python3-colorama python3-pip postgresql-client sqlite3 apt-transport-https gnupg2
11+
12+
if grep "VERSION_CODENAME=jammy" /etc/os-release; then
13+
echo "Setting up LLVM repo in the 22.04 Ubuntu base"
14+
wget -O /etc/apt/trusted.gpg.d/apt.llvm.org.asc https://apt.llvm.org/llvm-snapshot.gpg.key
15+
16+
cat > /etc/apt/sources.list.d/llvm.list <<EOF
17+
deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
18+
deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
19+
EOF
20+
fi
21+
22+
# Install aws cli for uploading history to S3
23+
if grep "VERSION_CODENAME=jammy" /etc/os-release; then
24+
pip3 install awscli --upgrade
25+
else
26+
# Ubuntu 24.04 or later need extra flag
27+
pip3 install awscli --upgrade --break-system-packages
28+
fi
1129

12-
pip3 install awscli --upgrade # for uploading history to s3
1330

1431
# install test dependencies if STELLAR_CORE_VERSION ends with '~buildtests'
1532
if [[ "$STELLAR_CORE_VERSION" == *~buildtests ]]; then

0 commit comments

Comments
 (0)