From 2ee23c9f329d4f0f03928c6186ed7e5a40030c3a Mon Sep 17 00:00:00 2001
From: Elvis Nieves <elvis.nievesmiranda@gmail.com>
Date: Thu, 5 Sep 2024 17:54:38 -0400
Subject: [PATCH] chore: add devcontainer chromium fonts and install node and
 bun runtimes (#99)

---
 .devcontainer/BlazorReports.Dev.Dockerfile | 15 ++++++++-------
 .devcontainer/devcontainer.json            |  5 +++--
 .devcontainer/tools/chromium-install.sh    |  9 +++++++++
 .devcontainer/tools/node_bun-install.sh    |  6 ++++++
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 .devcontainer/tools/chromium-install.sh
 create mode 100644 .devcontainer/tools/node_bun-install.sh

diff --git a/.devcontainer/BlazorReports.Dev.Dockerfile b/.devcontainer/BlazorReports.Dev.Dockerfile
index fa3d016..575f74e 100644
--- a/.devcontainer/BlazorReports.Dev.Dockerfile
+++ b/.devcontainer/BlazorReports.Dev.Dockerfile
@@ -1,8 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0-preview
+FROM mcr.microsoft.com/devcontainers/dotnet:8.0
 
-RUN apt-get update && apt-get install -y wget gnupg lsb-release fonts-liberation && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install chromium -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
+# Install Node and Bun
+COPY tools/node_bun-install.sh /tmp/node_bun-install.sh
+RUN su vscode -c "/bin/bash /tmp/node_bun-install.sh" 2>&1
+
+# Install Chromium
+COPY tools/chromium-install.sh /tmp/chromium-install.sh
+RUN su vscode -c "/bin/bash /tmp/chromium-install.sh" 2>&1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index adb0c94..3adca12 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,12 +11,13 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        "ms-dotnettools.csdevkit@prerelease",
+        "ms-dotnettools.csdevkit",
         "ms-azuretools.vscode-docker",
         "GitHub.copilot-chat",
         "GitHub.copilot",
         "esbenp.prettier-vscode",
-        "editorconfig.editorconfig"
+        "editorconfig.editorconfig",
+        "csharpier.csharpier-vscode"
       ]
     }
   },
diff --git a/.devcontainer/tools/chromium-install.sh b/.devcontainer/tools/chromium-install.sh
new file mode 100644
index 0000000..41f05d5
--- /dev/null
+++ b/.devcontainer/tools/chromium-install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+apt-get update
+apt-get install -y wget gnupg lsb-release fonts-liberation fonts-roboto
+wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg
+sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+apt-get update
+apt-get install chromium -y --no-install-recommends
+rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/tools/node_bun-install.sh b/.devcontainer/tools/node_bun-install.sh
new file mode 100644
index 0000000..4f29072
--- /dev/null
+++ b/.devcontainer/tools/node_bun-install.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Install node and github copilot cli
+source /usr/local/share/nvm/nvm.sh
+nvm install --lts
+curl -fsSL https://bun.sh/install | bash