Skip to content

Commit 3ddc7e1

Browse files
committed
tools/Dockerfile: Use Ubuntu 24.04 for building
We switch to using Ubuntu 24.04 which has LTS until 2029. Signed-off-by: Costin Lupu <[email protected]>
1 parent 82501bb commit 3ddc7e1

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

tools/Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/ubuntu/ubuntu:20.04
1+
FROM public.ecr.aws/ubuntu/ubuntu:24.04
22

33
SHELL ["/bin/bash", "-c"]
44

@@ -17,7 +17,7 @@ RUN apt-get update && \
1717

1818
# Install bindgen dependencies
1919
RUN apt-get update && \
20-
apt-get install -y llvm-dev libclang-dev clang
20+
apt-get install -y llvm-dev libclang-dev clang perl
2121

2222
# Build static version of Openssl.
2323
ENV OPENSSL_VERSION=OpenSSL_1_1_1q
@@ -31,16 +31,19 @@ RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} && \
3131

3232
# Setup the right rust ver
3333
ENV RUST_VERSION=1.71.1
34+
ENV RUST_CARGO_AUDIT_VERSION=0.20.0
35+
ENV RUST_CARGO_ABOUT_VERSION=0.6.6
36+
3437
RUN source $HOME/.cargo/env && \
3538
ARCH=$(uname -m) && \
36-
# Install and set 1.71.1 as default
39+
# Install and set ${RUST_VERSION} as default
3740
rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
3841
rustup default ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
3942
rustup target add --toolchain ${RUST_VERSION} ${ARCH}-unknown-linux-musl && \
4043
# Install stable toolchain (needed to run fresh cargo-about)
4144
rustup toolchain install stable-${ARCH}-unknown-linux-gnu && \
42-
cargo +stable install cargo-about --version 0.6.6 --locked && \
43-
cargo install cargo-audit --version 0.17.6 --locked
45+
cargo +stable install cargo-about --version ${RUST_CARGO_ABOUT_VERSION} --locked && \
46+
cargo install cargo-audit --version ${RUST_CARGO_AUDIT_VERSION} --locked
4447

4548
# Install docker for nitro-cli build-enclave runs
4649
RUN apt-get update && \

0 commit comments

Comments
 (0)