From a9d3437a1730302b7a9c420df2b38e54067f4b82 Mon Sep 17 00:00:00 2001
From: Julien Dubois <julien.dubois@gmail.com>
Date: Wed, 22 Nov 2023 09:40:52 +0000
Subject: [PATCH] Try to fix DevContainers image

---
 .devcontainer/Dockerfile        | 22 ----------------
 .devcontainer/devcontainer.json | 45 +++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index decd41b2d3e..00000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG VARIANT=21-bookworm
-FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
-
-# [Option] Install Maven
-ARG INSTALL_MAVEN="false"
-ARG MAVEN_VERSION=""
-# [Option] Install Gradle
-ARG INSTALL_GRADLE="false"
-ARG GRADLE_VERSION=""
-RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
-    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6af41ceba0f..309c3ad8279 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,20 +1,39 @@
 {
   "name": "Java",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "args": {
-      "VARIANT": "21-bookworm",
-      "INSTALL_MAVEN": "true",
-      "MAVEN_VERSION": "3.9.5",
-      "INSTALL_GRADLE": "false",
-      "NODE_VERSION": "lts/*"
-    }
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "21-oracle",
+      "jdkDistro": "oracle"
+    },
+    "ghcr.io/devcontainers/features/node:1": {},
+    "docker-in-docker": "latest",
+    "github-cli": "latest",
+    "terraform": "latest"
   },
-  "settings": {
-    "java.home": "/docker-java-home",
-    "maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn"
+
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "dawhite.mustache",
+        "eamodio.gitlens",
+        "esbenp.prettier-vscode",
+        "github.vscode-pull-request-github",
+        "hashicorp.terraform",
+        "ms-azuretools.vscode-azureterraform",
+        "ms-dotnettools.vscode-dotnet-runtime",
+        "ms-vscode.vscode-node-azure-pack",
+        "ms-vsliveshare.vsliveshare",
+        "redhat.fabric8-analytics",
+        "redhat.vscode-xml",
+        "streetsidesoftware.code-spell-checker",
+        "visualstudioexptteam.vscodeintellicode",
+        "vscjava.vscode-java-pack"
+      ]
+    }
   },
-  "extensions": ["vscjava.vscode-java-pack"],
+
   "forwardPorts": [7471],
   "remoteUser": "vscode"
 }