From 8c56dcfcc985dcdcfa9210b70bb1a5ec6ebea059 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 16 Nov 2023 09:55:11 +0100 Subject: [PATCH 1/2] Use .NET 8 docker images for dev containers --- .devcontainer/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8e4b33eac..dd5eccfd4 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/vscode/devcontainers/dotnet:1-7.0-jammy +FROM mcr.microsoft.com/vscode/devcontainers/dotnet:1-8.0-jammy USER vscode WORKDIR /home/vscode @@ -10,12 +10,6 @@ RUN set -eux \ && rm packages-microsoft-prod.deb \ && sudo apt update \ && sudo apt-get install -y libmsquic \ - && wget -q https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh \ - && bash dotnet-install.sh --channel 8.0 --install-dir ~/.dotnet8.0 \ && sudo rm -rf /var/lib/apt/lists/* \ && sudo apt-get clean \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - -# Set environment variables -ENV DOTNET_ROOT=/home/vscode/.dotnet8.0 \ - PATH=/home/vscode/.dotnet8.0:/home/vscode/.dotnet8.0/tools:/home/vscode/.cargo/bin:$PATH From b6ff91296f9dfadff1c9e75b6d7ffe112338ab1a Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 16 Nov 2023 09:57:09 +0100 Subject: [PATCH 2/2] Keep cargo in PATH --- .devcontainer/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index dd5eccfd4..7eb757f78 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -13,3 +13,6 @@ RUN set -eux \ && sudo rm -rf /var/lib/apt/lists/* \ && sudo apt-get clean \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + +# Set environment variables +ENV PATH=/home/vscode/.cargo/bin:$PATH