From 9af54638aa3071d0af3ad85a85b7e9f5ac4d7a3c Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahathaway@microsoft.com>
Date: Thu, 3 Oct 2024 11:30:09 -0700
Subject: [PATCH] Add sudo and apt for MicroBuild install in aspnetcore
 pipelines

---
 src/alpine/3.19/amd64/Dockerfile               | 1 +
 src/alpine/3.20/amd64/Dockerfile               | 1 +
 src/cbl-mariner/2.0/crossdeps/amd64/Dockerfile | 3 +++
 src/cbl-mariner/2.0/fpm/amd64/Dockerfile       | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/src/alpine/3.19/amd64/Dockerfile b/src/alpine/3.19/amd64/Dockerfile
index 609570080..c84260551 100644
--- a/src/alpine/3.19/amd64/Dockerfile
+++ b/src/alpine/3.19/amd64/Dockerfile
@@ -2,6 +2,7 @@ FROM amd64/alpine:3.19
 
 # Install .NET and test dependencies
 RUN apk add --upgrade --no-cache \
+        apt \
         autoconf \
         automake \
         bash \
diff --git a/src/alpine/3.20/amd64/Dockerfile b/src/alpine/3.20/amd64/Dockerfile
index c2a3fd438..88cdaf32d 100644
--- a/src/alpine/3.20/amd64/Dockerfile
+++ b/src/alpine/3.20/amd64/Dockerfile
@@ -2,6 +2,7 @@ FROM amd64/alpine:3.20
 
 # Install .NET and test dependencies
 RUN apk add --upgrade --no-cache \
+        apt \
         autoconf \
         automake \
         bash \
diff --git a/src/cbl-mariner/2.0/crossdeps/amd64/Dockerfile b/src/cbl-mariner/2.0/crossdeps/amd64/Dockerfile
index 3b89b676f..371c8fda1 100644
--- a/src/cbl-mariner/2.0/crossdeps/amd64/Dockerfile
+++ b/src/cbl-mariner/2.0/crossdeps/amd64/Dockerfile
@@ -2,6 +2,9 @@ FROM mcr.microsoft.com/cbl-mariner/base/core:2.0
 
 RUN tdnf update -y && \
     tdnf install -y \
+        # Needed to install MicroBuild in Azure DevOps pipelines
+        sudo \
+        apt \
         # Provides 'su', required by Azure DevOps
         ca-certificates \
         git \
diff --git a/src/cbl-mariner/2.0/fpm/amd64/Dockerfile b/src/cbl-mariner/2.0/fpm/amd64/Dockerfile
index 65614a1c0..2bea80f30 100644
--- a/src/cbl-mariner/2.0/fpm/amd64/Dockerfile
+++ b/src/cbl-mariner/2.0/fpm/amd64/Dockerfile
@@ -17,5 +17,8 @@ RUN tdnf install -y \
         # Provides functionality for AzureCLI AzDO task
         powershell \
         azure-cli \
+        # Needed to install MicroBuild in Azure DevOps pipelines
+        sudo \
+        apt \
     && tdnf clean all \
     && gem install fpm