Skip to content

Commit c512586

Browse files
committed
feat(cubestore/docker): Upgrade OS to bullseye
1 parent a62f59c commit c512586

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

rust/cubestore/.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@ target
22
Dockerfile
33
.cubestore
44
upstream
5+
dist
6+
js-wrapper
7+
bin
8+
cross
9+
downloaded
510
cubestore/.cubestore
611
cubestore/upstream

rust/cubestore/Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
FROM rust:1.47-buster as builder
2-
# Crashing....
3-
# FROM rustlang/rust:nightly-buster as builder
1+
FROM rust:1-bullseye as builder
42

5-
# Because error[E0554]: `#![feature]` may not be used on the stable release channel
6-
# /build/arrow/rust/arrow/src/lib.rs:127:1
7-
# #![feature(specialization)]
83
RUN rustup update && \
94
rustup default nightly-2022-06-22 && \
10-
rustup component add --toolchain nightly-2022-06-22 rustfmt
5+
rustup component add --toolchain nightly-2022-06-22 rustfmt;
116

127
RUN apt update \
138
&& apt upgrade -y \
149
&& DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common pkg-config wget gnupg git apt-transport-https ca-certificates \
1510
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
16-
&& add-apt-repository "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-12 main" \
11+
&& add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-12 main" \
1712
&& apt update \
1813
&& apt install -y git llvm-12 clang-12 libclang-12-dev clang-12 cmake \
1914
&& rm -rf /var/lib/apt/lists/*;
@@ -46,7 +41,7 @@ COPY cubestore cubestore
4641
RUN [ "$WITH_AVX2" -eq "1" ] && export RUSTFLAGS="-C target-feature=+avx2"; \
4742
cargo build --release -p cubestore
4843

49-
FROM debian:buster-slim
44+
FROM debian:bullseye-slim
5045

5146
WORKDIR /cube
5247

0 commit comments

Comments
 (0)