Skip to content

Commit 9ab3358

Browse files
committed
chore: unpin cargo-deny and specify tag for libseccomp
Unpin cargo-deny because rust tool-chain has been upgraded. Specify tag for libseccomp to have a fixed version. Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent f610cae commit 9ab3358

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

tools/devctr/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-too
113113
&& rustup target add x86_64-unknown-linux-musl \
114114
&& rustup target add aarch64-unknown-linux-musl \
115115
&& rustup component add llvm-tools-preview clippy rustfmt \
116-
&& cargo install --locked cargo-audit cargo-deny@0.16.1 grcov cargo-sort cargo-afl \
116+
&& cargo install --locked cargo-audit cargo-deny grcov cargo-sort cargo-afl \
117117
&& cargo install --locked kani-verifier && cargo kani setup \
118118
\
119119
&& NIGHTLY_TOOLCHAIN=$(rustup toolchain list | grep nightly | tr -d '\n') \
@@ -149,12 +149,18 @@ RUN cd /usr/include/$ARCH-linux-musl \
149149
&& ln -s ../asm-generic asm-generic
150150

151151
# Install static version of libseccomp
152-
#
152+
# We need to compile from source because
153+
# libseccomp provided by the distribution is not
154+
# compiled with musl-gcc and we need this
155+
# for our musl builds.
156+
# We specify the tag in order to have a fixed version
157+
# of the library.
153158
RUN apt-get update \
154159
&& apt-get -y install \
155160
libtool gperf \
156161
&& git clone https://github.com/seccomp/libseccomp /tmp/libseccomp \
157162
&& cd /tmp/libseccomp \
163+
&& git checkout tags/v2.5.5 \
158164
&& ./autogen.sh \
159165
&& CC="musl-gcc -static" ./configure --enable-static=yes --enable-shared=false \
160166
&& make install \

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:-v76}
71+
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v77}
7272

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

0 commit comments

Comments
 (0)