From c39e76bd4bd7ce2aa1d9255fa2f515dbd288a073 Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Tue, 22 Nov 2022 12:59:49 +0100
Subject: [PATCH] chore(devcontainer): update dependencies

---
 .devcontainer/Dockerfile        | 11 ++++++-----
 .devcontainer/devcontainer.json | 29 +++++++++++++++--------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e6f61d09..fd3323c7 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -10,6 +10,8 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/
 
 # Install powershell
 ARG PS_VERSION="7.2.1"
+# powershell-7.3.0-linux-x64.tar.gz
+# powershell-7.3.0-linux-arm64.tar.gz
 RUN ARCH="$(dpkg --print-architecture)"; \
     if [ "${ARCH}" = "amd64" ]; then \
         PS_BIN="v$PS_VERSION/powershell-$PS_VERSION-linux-x64.tar.gz"; \
@@ -25,10 +27,13 @@ RUN ARCH="$(dpkg --print-architecture)"; \
 
 ENV PATH=$PATH:/usr/local/pwsh
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+RUN echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_11/ /' | tee /etc/apt/sources.list.d/shells:fish:release:3.list; \
+    curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:3/Debian_11/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null; \
+    apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get install -y --no-install-recommends \
     fish \
     tmux \
+    fzf \
     && apt-get clean
 
 ARG USERNAME=vscode
@@ -39,10 +44,6 @@ RUN mkdir /home/${USERNAME}/bin; \
     chmod +x /home/${USERNAME}/bin/oh-my-posh; \
     chown ${USERNAME}: /home/${USERNAME}/bin;
 
-# Download the fzf binary
-RUN wget https://github.com/junegunn/fzf/releases/download/0.29.0/fzf-0.29.0-linux_$(dpkg --print-architecture).tar.gz -O /home/${USERNAME}/bin/fzf; \
-    chmod +x /home/${USERNAME}/bin/fzf;
-
 # NOTE: devcontainers are Linux-only at this time but when
 # Windows or Darwin is supported someone will need to improve
 # the code logic above.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f1523239..504a840d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
       // Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
       // Append -bullseye or -buster to pin to an OS version.
       // Use -bullseye variants on local arm64/Apple Silicon.
-      "VARIANT": "1.18-bullseye",
+      "VARIANT": "1.19-bullseye",
 
       // Options:
 
@@ -21,7 +21,7 @@
 
       "NODE_VERSION": "lts/*",
       //Powershell version
-      "PS_VERSION": "7.2.1"
+      "PS_VERSION": "7.2.7"
     }
   },
   "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
@@ -59,18 +59,19 @@
 
   // Add the IDs of extensions you want installed when the container is created.
   "extensions": [
-    "actboy168.tasks",
-    "eamodio.gitlens",
-    "bungcip.better-toml",
-    "davidanson.vscode-markdownlint",
-    "editorconfig.editorconfig",
-    "esbenp.prettier-vscode",
-    "github.vscode-pull-request-github",
-    "golang.go",
-    "ms-vscode.powershell",
-    "redhat.vscode-yaml",
-    "yzhang.markdown-all-in-one"
-  ],
+	"actboy168.tasks",
+	"eamodio.gitlens",
+	"bungcip.better-toml",
+	"davidanson.vscode-markdownlint",
+	"editorconfig.editorconfig",
+	"esbenp.prettier-vscode",
+	"github.vscode-pull-request-github",
+	"golang.go",
+	"ms-vscode.powershell",
+	"redhat.vscode-yaml",
+	"yzhang.markdown-all-in-one",
+	"ms-azuretools.vscode-azurefunctions"
+],
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [3000],