Skip to content

Commit 0d898bf

Browse files
committed
chore: update rust version to 1.82 and add libseccomp to devctr
- Update Rust to 1.82 version - Add libseccomp needed for updated seccompiler version Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent 4c33853 commit 0d898bf

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# allowlisted using a toolchain that requires it, causing the A/B-test to
1212
# always fail.
1313
[toolchain]
14-
channel = "1.79.0"
14+
channel = "1.82.0"
1515
targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
1616
profile = "minimal"
1717

tools/devctr/Dockerfile

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM public.ecr.aws/lts/ubuntu:24.04
44
# The Rust toolchain layer will get updated most frequently, but we could keep the system
55
# dependencies layer intact for much longer.
66

7-
ARG RUST_TOOLCHAIN="1.79.0"
7+
ARG RUST_TOOLCHAIN="1.82.0"
88
ARG TMP_BUILD_DIR=/tmp/build
99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG PIP_BREAK_SYSTEM_PACKAGES=1
@@ -48,6 +48,8 @@ RUN apt-get update \
4848
&& apt-get -y install --no-install-recommends \
4949
# essential build tools
5050
gcc make libc-dev binutils-dev libssl-dev \
51+
# Needed for `seccompiler`.
52+
libseccomp-dev \
5153
# Useful utilities
5254
gdbserver \
5355
# Needed in order to be able to compile `userfaultfd-sys`.
@@ -137,6 +139,22 @@ RUN cd /usr/include/$ARCH-linux-musl \
137139
&& ln -s ../linux linux \
138140
&& ln -s ../asm-generic asm-generic
139141

142+
# Install static version of libseccomp
143+
#
144+
RUN apt-get update \
145+
&& apt-get -y install \
146+
libtool gperf \
147+
&& git clone https://github.com/seccomp/libseccomp /tmp/libseccomp \
148+
&& cd /tmp/libseccomp \
149+
&& ./autogen.sh \
150+
&& CC="musl-gcc -static" ./configure --enable-static=yes --enable-shared=false \
151+
&& make install \
152+
&& cd \
153+
&& apt-get purge -y \
154+
libtool gperf \
155+
&& apt-get autoremove -y \
156+
&& rm -rf /tmp/libseccomp
157+
140158
# Build iperf3-vsock
141159
RUN mkdir "$TMP_BUILD_DIR" && cd "$TMP_BUILD_DIR" \
142160
&& git clone https://github.com/stefano-garzarella/iperf-vsock \

tools/devtool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
DEVCTR_IMAGE_NO_TAG="public.ecr.aws/firecracker/fcuvm"
6969

7070
# Development container tag
71-
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v75}
71+
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v76}
7272

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

0 commit comments

Comments
 (0)