Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 07fb794

Browse files
authored
Devcontainer updates (#2279)
1 parent f511862 commit 07fb794

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.devcontainer/Dockerfile

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/ubuntu/.devcontainer/base.Dockerfile
22

33
ARG VARIANT="ubuntu-22.04"
4-
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
54

6-
# Setup MS package signing key:
7-
# NB: needs changing if VARIANT changes
8-
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
9-
dpkg -i packages-microsoft-prod.deb && \
10-
rm packages-microsoft-prod.deb
5+
# note: keep this in sync with .github/workflows/ci.yml
6+
ARG RUSTVERSION="1.63"
117

12-
# Install APT HTTPS transport required for MS packages:
13-
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y apt-transport-https
8+
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
149

1510
# Install packages required for build:
1611
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1712
&& apt-get -y install --no-install-recommends \
1813
libunwind-dev clang build-essential libssl-dev pkg-config lldb \
19-
bash-completion npm python-is-python3
14+
bash-completion npm python-is-python3 \
15+
dotnet6
16+
17+
# Install Rust:
18+
USER vscode
19+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain ${RUSTVERSION} -y
20+
USER root

.devcontainer/devcontainer.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@
4242
// Note: available features are listed in: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/container-features/src/devcontainer-features.json
4343
"features": {
4444
"azure-cli": "latest",
45-
"python": "os-provided",
46-
"dotnet": {
47-
"version": "latest"
48-
},
49-
"rust": {
50-
"version": "latest",
51-
"profile": "default"
52-
}
45+
"python": "os-provided"
5346
}
5447
}

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v2
2323
- name: Install specific Rust version
24+
# note: keep this in sync with .devcontainer/Dockerfile
2425
run: |
2526
rustup default 1.63
2627
rustup component add clippy rustfmt

0 commit comments

Comments
 (0)