Skip to content

Commit 9cdbe2f

Browse files
authored
test: Update Amazon Arm64 container to use an Amazon Linux image. (#2111)
1 parent 924765b commit 9cdbe2f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/Dockerfile.amazon

+9-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ RUN dotnet publish "SmokeTestApp.csproj" -c Release -o /app/publish /p:UseAppHos
2020

2121
FROM base AS final
2222
ARG DOTNET_VERSION
23-
# install asp.netcore - use the Centos 7 package feed because amazonlinux is rhel based
24-
RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
25-
RUN yum install aspnetcore-runtime-${DOTNET_VERSION} -y
23+
# install asp.netcore the *really* hard way...
24+
# other methods don't seem to work or take forever
25+
RUN echo "max_parallel_downloads=10" >> /etc/dnf/dnf.conf
26+
RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf
27+
RUN dnf install -y wget tar findutils gzip libicu
28+
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
29+
RUN chmod +x ./dotnet-install.sh
30+
RUN ./dotnet-install.sh --channel ${DOTNET_VERSION} --runtime aspnetcore
31+
ENV PATH="${PATH}:/root/.dotnet:/root/.dotnet/tools"
2632

2733
# Enable the agent
2834
ARG NEW_RELIC_HOST

tests/Agent/IntegrationTests/ContainerApplications/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ services:
6666
file: docker-compose-smoketestapp.yml
6767
service: smoketestapp
6868
build:
69-
dockerfile: SmokeTestApp/Dockerfile.centos
69+
dockerfile: SmokeTestApp/Dockerfile.amazon
7070

7171
networks:
7272
default:

0 commit comments

Comments
 (0)