From 5dafbeee06d177ae9dd4d9e5002a0e2219628a0d Mon Sep 17 00:00:00 2001
From: Tanvir Ahmed <54685928+m-t-a97@users.noreply.github.com>
Date: Wed, 11 Jun 2025 22:00:37 +0100
Subject: [PATCH] build(core): Replaced Microsoft Java with Temurin
 distribution on dev container

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

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4d8844d764..80d3035b54 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -37,16 +37,16 @@ ARG OS_ARCHITECTURE
 RUN mkdir -p /usr/java
 RUN echo "Building on platform: $BUILDPLATFORM"
 RUN case "$BUILDPLATFORM" in \
-  "linux/amd64") OS_ARCHITECTURE="linux-x64" ;; \
-  "linux/arm64") OS_ARCHITECTURE="linux-aarch64" ;; \
-  "darwin/amd64") OS_ARCHITECTURE="macos-x64" ;; \
-  "darwin/arm64") OS_ARCHITECTURE="macos-aarch64" ;; \
+  "linux/amd64") OS_ARCHITECTURE="x64_linux" ;; \
+  "linux/arm64") OS_ARCHITECTURE="aarch64_linux" ;; \
+  "darwin/amd64") OS_ARCHITECTURE="x64_mac" ;; \
+  "darwin/arm64") OS_ARCHITECTURE="aarch64_mac" ;; \
   *) echo "Unsupported BUILDPLATFORM: $BUILDPLATFORM" && exit 1 ;; \
   esac && \
-  wget "https://aka.ms/download-jdk/microsoft-jdk-21.0.6-$OS_ARCHITECTURE.tar.gz" && \
-  mv "microsoft-jdk-21.0.6-$OS_ARCHITECTURE.tar.gz" microsoft-jdk-21.0.6.tar.gz
-RUN tar -xzvf microsoft-jdk-21.0.6.tar.gz && \
-  mv jdk-21.0.6+7 jdk-21 && \
+  wget "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_${OS_ARCHITECTURE}_hotspot_21.0.7_6.tar.gz" && \
+  mv OpenJDK21U-jdk_${OS_ARCHITECTURE}_hotspot_21.0.7_6.tar.gz openjdk-21.0.7.tar.gz
+RUN tar -xzvf openjdk-21.0.7.tar.gz && \
+  mv jdk-21.0.7+6 jdk-21 && \
   mv jdk-21 /usr/java/
 ENV JAVA_HOME=/usr/java/jdk-21
 ENV PATH="$PATH:$JAVA_HOME/bin"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 048a12401a..7925ceaca1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -39,7 +39,7 @@
         "yoavbls.pretty-ts-errors",
         "github.vscode-github-actions",
         "vscjava.vscode-java-pack",
-        "ms-azuretools.vscode-docker"
+        "docker.docker"
       ]
     }
   }