From c575f9cfd3b80abe15737b3fa1c60227ca21ecdc Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Mon, 22 Jan 2024 11:38:09 +0000
Subject: [PATCH] update dev container setup

---
 .devcontainer/Dockerfile        | 12 +++++++-----
 .devcontainer/devcontainer.json |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3892e574..63f544f0 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,5 @@
-# The devcontainer will be based on debian
 # The base container already has entrypoint, vscode user account, etc. out of the box
-FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-22.04
 
 # Set permissions for mounts in devcontainer.json
 RUN mkdir -p /home/vscode/.vscode-server/bin
@@ -10,9 +9,11 @@ RUN chown -R vscode:vscode /home/vscode/.vscode-server
 # Adjust this list based on your demands
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install -y \
     sshpass \
     curl \
+    wget \
+    openssl \
     iputils-ping \
     htop \
     zsh \
@@ -21,10 +22,11 @@ RUN apt-get update \
     tmux \
     nload \
     yamllint \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -Rf /usr/share/doc && rm -Rf /usr/share/man \
     && apt-get clean
 
+# Install gnmic
+RUN bash -c "$(curl -sL https://get-gnmic.openconfig.net)"
+
 # Install oh-my-zsh for more terminal features and set is as primary shell
 ENV SHELL /bin/zsh
 RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh || true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d04d5431..7bf6642a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,7 +10,8 @@
                     "version": "1.21"
                 },
             "ghcr.io/devcontainers/features/docker-in-docker:2.7": {
-                    "version": "latest"
+                "version": "latest",
+                "dockerDashComposeVersion": "v2"
                 }
         },
         // add any required extensions that must be pre-installed in the devcontainer
-- 
GitLab