From 95cd6a4eeb5443523b1a11b3d28a5dd283a1e2d3 Mon Sep 17 00:00:00 2001 From: David Michael Barr Date: Wed, 15 Nov 2023 15:54:02 +0900 Subject: [PATCH] devcontainer: Upgrade the base image revision Update Intel SDE to 9.27.0 and explicitly version all included tools. This will trigger an image rebuild when a new toolchain is released. --- .devcontainer/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fe690e4cf1..9bf6977cf2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,19 +1,20 @@ -FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm +FROM mcr.microsoft.com/devcontainers/rust:dev-1-bookworm RUN dpkg --add-architecture arm64 \ && apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y --no-install-recommends \ libaom-dev libdav1d-dev libaom-dev:arm64 libdav1d-dev:arm64 \ libclang-dev libgit2-dev libcurl4-openssl-dev libfuzzer-14-dev \ gcc-aarch64-linux-gnu libc6-dev-arm64-cross nasm dav1d qemu-user \ + meson ninja-build \ && rm -rf /var/lib/apt/lists/* RUN rustup target add aarch64-unknown-linux-gnu RUN export CARGO_PROFILE_RELEASE_STRIP=true \ - && cargo install -q cargo-c \ - && cargo install -q cargo-criterion \ - && cargo install -q cargo-fuzz \ + && cargo install -q cargo-c --version "0.9.27+cargo-0.74.0" \ + && cargo install -q cargo-criterion --version "1.1.0" \ + && cargo install -q cargo-fuzz --version "0.11.2" \ && rm -rf /usr/local/cargo/registry -RUN SDE=sde-external-9.14.0-2022-10-25-lin \ - && curl -sSf https://downloadmirror.intel.com/751535/$SDE.tar.xz | tar Jx -C /opt \ +RUN SDE=sde-external-9.27.0-2023-09-13-lin \ + && curl -sSf https://downloadmirror.intel.com/788820/$SDE.tar.xz | tar Jx -C /opt \ && ln -sv /opt/$SDE/sde64 /usr/local/bin/sde64 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS=-Clinker=aarch64-linux-gnu-gcc