From 381f9b246447e1a7957c1d5e028636ea9729a3ce Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 22 Aug 2024 06:15:05 -0700
Subject: [PATCH] Install powershell and azure-cli on deb 12 (#1187)

---
 src/debian/11/amd64/Dockerfile       |  3 +--
 src/debian/12/gcc14/amd64/Dockerfile | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/debian/11/amd64/Dockerfile b/src/debian/11/amd64/Dockerfile
index 3eba099cd..a0d032019 100644
--- a/src/debian/11/amd64/Dockerfile
+++ b/src/debian/11/amd64/Dockerfile
@@ -49,8 +49,7 @@ RUN echo "locales locales/default_environment_locale select en_US.UTF-8" | debco
     && rm "/etc/locale.gen" \
     && dpkg-reconfigure --frontend noninteractive locales
 
-# Install powershell. This is in the debpkg/amd64 docker file as it may not be required in the arm64
-# images, and is not actually supported over there.
+# Install powershell.
 RUN apt-get update && \
     apt-get install -y \
       apt-transport-https \
diff --git a/src/debian/12/gcc14/amd64/Dockerfile b/src/debian/12/gcc14/amd64/Dockerfile
index 8c7bd824d..ba8f2684d 100644
--- a/src/debian/12/gcc14/amd64/Dockerfile
+++ b/src/debian/12/gcc14/amd64/Dockerfile
@@ -3,6 +3,7 @@ FROM library/gcc:14-bookworm
 # Dependencies for dotnet/runtime native components.
 RUN apt-get update && \
     apt-get install -y \
+        azure-cli \
         cmake \
         curl \
         gdb \
@@ -29,3 +30,16 @@ ENV LANG=en_US.utf8
 # In the runtime repo, we (by design) give precedence to suffixed compilers before selecting unsuffixed one in PATH.
 RUN ln -s $(command -v gcc) /usr/bin/gcc-14 && \
     ln -s $(command -v g++) /usr/bin/g++-14
+
+# Install powershell. Specifically use deb 11 PMC because 12 doesn't have it yet.
+RUN apt-get update && \
+    apt-get install -y \
+      apt-transport-https \
+      software-properties-common \
+      curl && \
+    curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    rm packages-microsoft-prod.deb && \
+    apt-get update && \
+    apt-get install -y powershell && \
+    rm -rf /var/lib/apt/lists/*