From 9cdbe2f953fca8e4b621519c0fc83eb3ded88e3b Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:47:04 -0600
Subject: [PATCH] test: Update Amazon Arm64 container to use an Amazon Linux
 image.  (#2111)

---
 .../SmokeTestApp/Dockerfile.amazon                   | 12 +++++++++---
 .../ContainerApplications/docker-compose.yml         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.amazon b/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.amazon
index ee339ff8b..1b11ab00c 100644
--- a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.amazon
+++ b/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.amazon
@@ -20,9 +20,15 @@ RUN dotnet publish "SmokeTestApp.csproj" -c Release -o /app/publish /p:UseAppHos
 
 FROM base AS final
 ARG DOTNET_VERSION
-# install asp.netcore - use the Centos 7 package feed because amazonlinux is rhel based
-RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
-RUN yum install aspnetcore-runtime-${DOTNET_VERSION} -y
+# install asp.netcore the *really* hard way...
+# other methods don't seem to work or take forever
+RUN echo "max_parallel_downloads=10" >> /etc/dnf/dnf.conf
+RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+RUN dnf install -y wget tar findutils gzip libicu
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
+RUN chmod +x ./dotnet-install.sh
+RUN ./dotnet-install.sh --channel ${DOTNET_VERSION} --runtime aspnetcore
+ENV PATH="${PATH}:/root/.dotnet:/root/.dotnet/tools"
 
 # Enable the agent
 ARG NEW_RELIC_HOST
diff --git a/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml b/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
index 58262ec8a..c1045ddec 100644
--- a/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
+++ b/tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml
@@ -66,7 +66,7 @@ services:
             file: docker-compose-smoketestapp.yml
             service: smoketestapp
         build:
-            dockerfile: SmokeTestApp/Dockerfile.centos
+            dockerfile: SmokeTestApp/Dockerfile.amazon
            
 networks:
     default: