Skip to content

Commit 98aae6a

Browse files
committed
chore(cross): x86_64-unknown-linux-gnu - upgrade to bullseye
1 parent 20939c4 commit 98aae6a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

rust/cubestore/cross/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ For all another, we are using Cross.
1212

1313
Keep in mind:
1414

15-
- Don't use modern unix*, which ship newest `libc` (why we are using x86_64-unknown-linux-gnu-stretch instead of x86_64-unknown-linux-gnu-buster)
16-
- Better to use one clang/gcc version across images (`clang-12`)
15+
- Don't use modern unix*, which ship newest `libc` (current used 2.31)
16+
- Better to use one clang/gcc version across images (`clang-14`)
1717
- Try to use one OS for all images (`debian`) for unix*
1818

1919
```sh

rust/cubestore/cross/x86_64-unknown-linux-gnu.Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM debian:buster-slim
1+
# libc 2.31 python 3.9
2+
FROM debian:bullseye-slim
23

34
RUN apt-get update && apt-get -y upgrade \
45
&& DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common pkg-config wget gnupg git apt-transport-https ca-certificates \
56
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
6-
&& add-apt-repository "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-14 main" \
7+
&& add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main" \
78
&& apt-get update \
8-
# llvm14-dev will install python 3.8 as bin/python3
9+
# llvm14-dev will install python 3.9 as bin/python3
910
&& DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-14 clang-14 libclang-14-dev clang-14 make cmake \
1011
lzma-dev liblzma-dev \
1112
&& rm -rf /var/lib/apt/lists/*;

0 commit comments

Comments
 (0)