Skip to content

Commit 0bd543a

Browse files
committed
fix: Comment in dockerfile breaking cargo build
When building the docker image, newlines were removed meaning the commands after the comment about why we do not install kani for aarch64 became part of the comment itself. This resulted in a broken docker image. Fixes #3960 Signed-off-by: Patrick Roy <[email protected]>
1 parent 96b9e2c commit 0bd543a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/devctr/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ RUN cd /tmp/poetry && \
7171
HOME=. POETRY_VIRTUALENVS_CREATE=false poetry install --only main --no-interaction \
7272
&& rm -rf ~/.cache ~/.local /tmp/poetry
7373

74-
# Install the Rust toolchain
74+
# Install the Rust toolchain. Kani only work on x86, so only try to install it there.
7575
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
7676
&& rustup target add $ARCH-unknown-linux-musl \
7777
&& rustup component add llvm-tools-preview \
7878
&& cargo install cargo-audit cargo-deny grcov cargo-sort \
79-
&& (if [ "$ARCH" = "x86_64" ]; then cargo install kani-verifier && cargo kani setup; else true; fi) # Kani only work on x86_64 \
79+
&& (if [ "$ARCH" = "x86_64" ]; then cargo install kani-verifier && cargo kani setup; else true; fi) \
8080
&& rm -rf "$CARGO_HOME/registry" \
8181
&& ln -s "$CARGO_REGISTRY_DIR" "$CARGO_HOME/registry" \
8282
&& rm -rf "$CARGO_HOME/git" \

tools/devtool

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

7474
# Development container tag
75-
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v61}
75+
DEVCTR_IMAGE_TAG=${DEVCTR_IMAGE_TAG:-v62}
7676

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

0 commit comments

Comments
 (0)