From 9e1b477fbf12f62926193b41d556dd745860d18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E5=A4=A7=E5=AD=A6=E7=BC=96=E7=A8=8B?= Date: Sun, 11 Feb 2024 14:32:30 +0800 Subject: [PATCH 1/2] Update devcontainer.json --- src/rust/.devcontainer/devcontainer.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/rust/.devcontainer/devcontainer.json b/src/rust/.devcontainer/devcontainer.json index b7f480dc2..937eed8a6 100644 --- a/src/rust/.devcontainer/devcontainer.json +++ b/src/rust/.devcontainer/devcontainer.json @@ -11,19 +11,22 @@ "userGid": "1000", "upgradePackages": "true" }, - "ghcr.io/devcontainers/features/rust:1": "latest", - "ghcr.io/devcontainers/features/git:1": { + "ghcr.io/devcontainers/features/rust:1": { + "version": "latest", + "profile": "default" + }, + "ghcr.io/devcontainers/features/git:1": { "version": "latest", "ppa": "false" } }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "rustc --version", + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "rustc --version", - // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" + // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" } From 610d945d4e3fc23cefde71152a6b53e4a67ef069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E5=A4=A7=E5=AD=A6=E7=BC=96=E7=A8=8B?= Date: Sun, 11 Feb 2024 14:48:11 +0800 Subject: [PATCH 2/2] Update Dockerfile --- src/rust/.devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rust/.devcontainer/Dockerfile b/src/rust/.devcontainer/Dockerfile index 0230da837..5cc946ff3 100644 --- a/src/rust/.devcontainer/Dockerfile +++ b/src/rust/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ # [Choice] Debian OS version (use bookworm, or bullseye on local arm64/Apple Silicon): bookworm, buster, bullseye ARG VARIANT="bookworm" -FROM rust:1-${VARIANT} +FROM buildpack-deps:${VARIANT} RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131