Skip to content

Commit edadafd

Browse files
committed
upgrade cargo builds to debian bookworm
1 parent 8ffa76f commit edadafd

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

dockerfile/cargo/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM rust:1-bullseye AS build-env
1+
FROM --platform=$BUILDPLATFORM rust:1-bookworm AS build-env
22

33
RUN rustup component add rustfmt
44

@@ -19,7 +19,7 @@ RUN if [ "${TARGETARCH}" = "arm64" ]; then\
1919
else\
2020
apt update;\
2121
fi;\
22-
apt install -y libssl1.1:arm64 libssl-dev:arm64 openssl:arm64 libclang-dev clang cmake libstdc++6:arm64;\
22+
apt install -y libssl3:arm64 libssl-dev:arm64 openssl:arm64 libclang-dev clang cmake libstdc++6:arm64;\
2323
elif [ "${TARGETARCH}" = "amd64" ]; then\
2424
rustup target add x86_64-unknown-linux-gnu;\
2525
wget https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-linux-x86_64.zip;\
@@ -33,7 +33,7 @@ RUN if [ "${TARGETARCH}" = "arm64" ]; then\
3333
else\
3434
apt update;\
3535
fi;\
36-
apt install -y libssl1.1:amd64 libssl-dev:amd64 openssl:amd64 libclang-dev clang cmake libstdc++6:amd64;\
36+
apt install -y libssl3:amd64 libssl-dev:amd64 openssl:amd64 libclang-dev clang cmake libstdc++6:amd64;\
3737
fi
3838

3939
ARG GITHUB_ORGANIZATION
@@ -156,8 +156,8 @@ FROM busybox:1.34.1-musl AS busybox-full
156156
FROM alpine:3 as alpine-3
157157

158158
# Use TARGETARCH image for determining necessary libs
159-
FROM rust:1-bullseye as target-arch-libs
160-
RUN apt update && apt install -y libssl1.1 openssl clang libstdc++6
159+
FROM rust:1-bookworm as target-arch-libs
160+
RUN apt update && apt install -y libssl3 openssl clang libstdc++6
161161

162162
ARG TARGETARCH
163163
ENV TARGETARCH=$TARGETARCH

dockerfile/cargo/native.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM rust:1-bullseye AS build-env
1+
FROM rust:1-bookworm AS build-env
22

33
RUN rustup component add rustfmt
44

5-
RUN apt update && apt install -y libssl1.1 libssl-dev openssl libclang-dev clang cmake libstdc++6
5+
RUN apt update && apt install -y libssl3 libssl-dev openssl libclang-dev clang cmake libstdc++6
66
RUN if [ "$(uname -m)" = "aarch64" ]; then\
77
wget https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-linux-aarch_64.zip;\
88
unzip protoc-21.8-linux-aarch_64.zip -d /usr;\

0 commit comments

Comments
 (0)