mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-06 02:25:23 +00:00
Docker: Do not curl | bash
Instead, download the rustup-init binary directly and verify it's sha before executing. Also update debian image used in the bundled VM. The previous image file was no longer available. TEST=Rebuilt docker images BUG=b:192355221 Change-Id: I8a2d8091b9cecdf40ecbdd4bb6cef7ca161421d9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3011343 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
parent
5401edf519
commit
75eef5f065
3 changed files with 6 additions and 4 deletions
|
@ -52,8 +52,10 @@ VOLUME /workspace/logs
|
|||
|
||||
# Install the current crosvm rust toolchain via rustup.
|
||||
COPY rust-toolchain ./
|
||||
RUN curl https://sh.rustup.rs -sSf | sh -s -- \
|
||||
-y \
|
||||
RUN curl https://static.rust-lang.org/rustup/archive/1.24.3/x86_64-unknown-linux-gnu/rustup-init -sSf -o rustup-init \
|
||||
&& echo "3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 rustup-init" | sha256sum --check \
|
||||
&& chmod +x rustup-init \
|
||||
&& ./rustup-init -y \
|
||||
--profile minimal \
|
||||
-c rustfmt,clippy \
|
||||
--default-toolchain $(cat rust-toolchain)
|
||||
|
|
|
@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes \
|
|||
WORKDIR /workspace/vm
|
||||
|
||||
RUN curl -sSfL -o rootfs.qcow2 \
|
||||
"http://cloud.debian.org/images/cloud/bullseye/daily/20210208-542/debian-11-generic-${VM_ARCH}-daily-20210208-542.qcow2"
|
||||
"http://cloud.debian.org/images/cloud/bullseye/daily/20210702-691/debian-11-generic-${VM_ARCH}-daily-20210702-691.qcow2"
|
||||
|
||||
# Package `cloud_init_data.yaml` to be loaded during `first_boot.expect`
|
||||
COPY build/cloud_init_data.yaml ./
|
||||
|
|
|
@ -1 +1 @@
|
|||
r0007
|
||||
r0008
|
||||
|
|
Loading…
Reference in a new issue