From 6814b518c014a95a9acb7e627ad0bbd901354051 Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 18:59:06 -0500 Subject: [PATCH 1/8] Add devcontainer/codespace config --- .devcontainer/Dockerfile | 2 ++ .devcontainer/devcontainer.json | 9 +++++++++ .editorconfig | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 000000000..c21990c4d --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,2 @@ +ARG VARIANT="buster" +FROM rust:1-${VARIANT} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..ab0943d0e --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,9 @@ +{ + "name": "Rust", + "build": { + "dockerfile": "Dockerfile", + "args": { "VARIANT": "buster" } + }, + "extensions": ["EditorConfig.EditorConfig"], + "remoteUser": "vscode" +} diff --git a/.editorconfig b/.editorconfig index 7de8d32ee..7d715a8a0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,7 @@ indent_size = 2 [{Makefile,.SRCINFO}] indent_style = tab + +[*.json] +indent_style = space +indent_size = 2 From 954afe17287a1a43ebf36d3f0c2789b90774caa2 Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:06:22 -0500 Subject: [PATCH 2/8] Fix devcontainer source --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c21990c4d..153a3b5c2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,2 @@ ARG VARIANT="buster" -FROM rust:1-${VARIANT} +FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} From 415b306666cdf4a46d434b81fbc3110e15d353a2 Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:06:42 -0500 Subject: [PATCH 3/8] Add note --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 153a3b5c2..95428eb39 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,3 @@ +# NOTE: see https://hub.docker.com/_/microsoft-vscode-devcontainers ARG VARIANT="buster" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} From 11b8e4e9df568bff8b86f4a31955a2706e29da67 Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:14:08 -0500 Subject: [PATCH 4/8] Install cmake to devcontainer Required by libz-sys --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 95428eb39..f827d36e3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1,4 @@ # NOTE: see https://hub.docker.com/_/microsoft-vscode-devcontainers ARG VARIANT="buster" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} +RUN apt install cmake From e79d214478e9696c789166fd148b1d166a517c2c Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:24:43 -0500 Subject: [PATCH 5/8] Run `apt update` first --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f827d36e3..ed818afb9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ # NOTE: see https://hub.docker.com/_/microsoft-vscode-devcontainers ARG VARIANT="buster" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} -RUN apt install cmake +RUN apt update && apt install cmake From 164dbb93cd665f588f923250b7b125fe5982b8ce Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:30:48 -0500 Subject: [PATCH 6/8] Run apt commands in sudo mode --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ed818afb9..636551adf 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ # NOTE: see https://hub.docker.com/_/microsoft-vscode-devcontainers ARG VARIANT="buster" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} -RUN apt update && apt install cmake +RUN sudo apt update && sudo apt install cmake From ebef6728aaa34233da8dbfbac5914298ac3ad5be Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Fri, 11 Nov 2022 19:35:14 -0500 Subject: [PATCH 7/8] Use `-y` flag :facepalm: --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 636551adf..0ca9c711e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ # NOTE: see https://hub.docker.com/_/microsoft-vscode-devcontainers ARG VARIANT="buster" FROM mcr.microsoft.com/vscode/devcontainers/rust:1-${VARIANT} -RUN sudo apt update && sudo apt install cmake +RUN sudo apt update && sudo apt install -y cmake From a9bd0727f2847c7c151623cd40903b5c77404be6 Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Sat, 12 Nov 2022 01:19:02 +0000 Subject: [PATCH 8/8] Exclude assets from VSCode search --- .vscode/settings.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..50081e8cd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "search.exclude": { + "**/node_modules": false, + "**/target": true + } +}