Skip to content

Commit

Permalink
chore(devctr): update rust version to 1.82 and add libseccomp to devctr
Browse files Browse the repository at this point in the history
- Update Rust to 1.82 version
- Add libseccomp needed for updated seccompiler version

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
  • Loading branch information
ShadowCurse committed Nov 28, 2024
1 parent 4c33853 commit 969ac56
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# allowlisted using a toolchain that requires it, causing the A/B-test to
# always fail.
[toolchain]
channel = "1.79.0"
channel = "1.82.0"
targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
profile = "minimal"

20 changes: 19 additions & 1 deletion tools/devctr/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM public.ecr.aws/lts/ubuntu:24.04
# The Rust toolchain layer will get updated most frequently, but we could keep the system
# dependencies layer intact for much longer.

ARG RUST_TOOLCHAIN="1.79.0"
ARG RUST_TOOLCHAIN="1.82.0"
ARG TMP_BUILD_DIR=/tmp/build
ARG DEBIAN_FRONTEND=noninteractive
ARG PIP_BREAK_SYSTEM_PACKAGES=1
Expand Down Expand Up @@ -48,6 +48,8 @@ RUN apt-get update \
&& apt-get -y install --no-install-recommends \
# essential build tools
gcc make libc-dev binutils-dev libssl-dev \
# Needed for `seccompiler`.
libseccomp-dev \
# Useful utilities
gdbserver \
# Needed in order to be able to compile `userfaultfd-sys`.
Expand Down Expand Up @@ -137,6 +139,22 @@ RUN cd /usr/include/$ARCH-linux-musl \
&& ln -s ../linux linux \
&& ln -s ../asm-generic asm-generic

# Install static version of libseccomp
#
RUN apt-get update \
&& apt-get -y install \
libtool gperf \
&& git clone https://github.com/seccomp/libseccomp /tmp/libseccomp \
&& cd /tmp/libseccomp \
&& ./autogen.sh \
&& CC="musl-gcc -static" ./configure --enable-static=yes --enable-shared=false \
&& make install \
&& cd \
&& apt-get purge -y \
libtool gperf \
&& apt-get autoremove -y \
&& rm -rf /tmp/libseccomp

# Build iperf3-vsock
RUN mkdir "$TMP_BUILD_DIR" && cd "$TMP_BUILD_DIR" \
&& git clone https://github.com/stefano-garzarella/iperf-vsock \
Expand Down
2 changes: 1 addition & 1 deletion tools/devtool
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"

# Development container tag
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v75}
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v76}

# Development container image (name:tag)
# This should be updated whenever we upgrade the development container.
Expand Down

0 comments on commit 969ac56

Please sign in to comment.