From 2be146ceed3036d599f33a652fd948ceef6f9ee5 Mon Sep 17 00:00:00 2001 From: mullerj Date: Tue, 4 Jul 2023 16:50:06 -0400 Subject: [PATCH] Dev Container performance (#25) * Fixed devcontainer format * Added dotnet-linux-x64 devcontainer * Changed devcontainer image to python * Pinned OS version * Updated devcontainer base image * Reverted changes to devcontainer * Moved linux devcontainer file * Updated dotnet-publish to use subfolder --- .devcontainer/devcontainer.json | 36 +++++++++---------- .../.devcontainer/devcontainer.json | 11 ++++++ .github/workflows/dotnet-publish.yml | 1 + 3 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 .devcontainer/dotnet-linux-x64/.devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d91a01d..10c7479 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,22 +18,22 @@ "ghcr.io/devcontainers/features/powershell:1": { "version": "7.3" } -}, -"customizations": { - "vscode": { - "extensions": [ - "DavidAnson.vscode-markdownlint", - "eamodio.gitlens", - "github.vscode-github-actions", - "GitHub.codespaces", - "jebbs.plantuml", - "ms-python.isort", - "ms-vscode-remote.remote-containers", - "ms-vscode.cpptools-themes", - "ms-vscode.PowerShell", - "tomoki1207.pdf", - "yzhang.markdown-all-in-one" - ] - } -} + }, + "customizations": { + "vscode": { + "extensions": [ + "DavidAnson.vscode-markdownlint", + "eamodio.gitlens", + "github.vscode-github-actions", + "GitHub.codespaces", + "jebbs.plantuml", + "ms-python.isort", + "ms-vscode-remote.remote-containers", + "ms-vscode.cpptools-themes", + "ms-vscode.PowerShell", + "tomoki1207.pdf", + "yzhang.markdown-all-in-one" + ] + } + } } diff --git a/.devcontainer/dotnet-linux-x64/.devcontainer/devcontainer.json b/.devcontainer/dotnet-linux-x64/.devcontainer/devcontainer.json new file mode 100644 index 0000000..7734dcc --- /dev/null +++ b/.devcontainer/dotnet-linux-x64/.devcontainer/devcontainer.json @@ -0,0 +1,11 @@ +{ + "image": "mcr.microsoft.com/devcontainers/cpp:1.0.0-buster", + "features": { + "ghcr.io/devcontainers/features/python:1": { + "version": "3.11" + }, + "ghcr.io/devcontainers/features/dotnet:1": { + "version": "6" + } + } +} diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index 981aed3..c691772 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -56,6 +56,7 @@ jobs: uses: devcontainers/ci@v0.3 with: push: never + subFolder: .devcontainer/dotnet-linux-x64 runCmd: | cd ./src/dotnet chmod 755 *.sh