wip

Author: atoulme

packaging/tests/deb/dotnet/Dockerfile

@@ -1,19 +1,16 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+ARG ARCH=amd64
+
+FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim-${ARCH}
+
+ENV LANG=C.UTF-8
+
 WORKDIR /src
 COPY "packaging/tests/shared/dotnet/DotNetTestApp.csproj" .
 RUN dotnet restore "DotNetTestApp.csproj"
 COPY "packaging/tests/shared/dotnet/*.cs" .
-RUN dotnet build "DotNetTestApp.csproj" -c Release -o /app/build
+RUN dotnet build "DotNetTestApp.csproj" -c Release -o /app/build -r linux-${ARCH}
 
-FROM build AS publish
-RUN dotnet publish "DotNetTestApp.csproj" -c Release -o /app/publish
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim AS final
-
-ARG ARCH=amd64
-ARG RPM_ARCH=x86_64
-
-ENV LANG=C.UTF-8
+RUN dotnet publish "DotNetTestApp.csproj" -c Release -o /app/publish -r linux-${ARCH}
 
 RUN apt-get update
 RUN apt install -y  wget
@@ -28,7 +25,7 @@ RUN dpkg -i injector.deb
 
 RUN echo /usr/lib/opentelemetry/libotelinject.so >> /etc/ld.so.preload
 
-COPY --from=publish /app/publish .
+RUN cp /app/publish/* .
 COPY packaging/tests/shared/dotnet/test.sh test.sh
 
 CMD ["./test.sh"]

packaging/tests/deb/dotnet/run.sh

@@ -5,10 +5,8 @@ set -euo pipefail
 arch="${ARCH:-amd64}"
 if [ "$arch" = arm64 ]; then
   docker_platform=linux/arm64
-  rpm_arch=aarch64
 elif [ "$arch" = amd64 ]; then
   docker_platform=linux/amd64
-  rpm_arch=x86_64
 else
   echo "The architecture $arch is not supported."
   exit 1
@@ -20,7 +18,6 @@ cd $SCRIPT_DIR/../../../..
 docker build \
   --platform "$docker_platform" \
   --build-arg "ARCH=$arch" \
-  --build-arg "RPM_ARCH=$rpm_arch" \
   -t "instrumentation-dotnet-$arch" \
   -f packaging/tests/deb/dotnet/Dockerfile \
   .

packaging/tests/deb/java/run.sh

@@ -5,10 +5,8 @@ set -euo pipefail
 arch="${ARCH:-amd64}"
 if [ "$arch" = arm64 ]; then
   docker_platform=linux/arm64
-  rpm_arch=aarch64
 elif [ "$arch" = amd64 ]; then
   docker_platform=linux/amd64
-  rpm_arch=x86_64
 else
   echo "The architecture $arch is not supported."
   exit 1
@@ -26,7 +24,6 @@ fi
 docker build \
   --platform "$docker_platform" \
   --build-arg "ARCH=$arch" \
-  --build-arg "RPM_ARCH=$rpm_arch" \
   --build-arg "tomcat_download_url=$tomcat_download_url" \
   -t "instrumentation-java-$arch" \
   -f packaging/tests/deb/java/Dockerfile \

packaging/tests/deb/nodejs/run.sh

@@ -5,10 +5,8 @@ set -euo pipefail
 arch="${ARCH:-amd64}"
 if [ "$arch" = arm64 ]; then
   docker_platform=linux/arm64
-  rpm_arch=aarch64
 elif [ "$arch" = amd64 ]; then
   docker_platform=linux/amd64
-  rpm_arch=x86_64
 else
   echo "The architecture $arch is not supported."
   exit 1
@@ -20,7 +18,6 @@ cd $SCRIPT_DIR/../../../..
 docker build \
   --platform "$docker_platform" \
   --build-arg "ARCH=$arch" \
-  --build-arg "RPM_ARCH=$rpm_arch" \
   -t "instrumentation-nodejs-$arch" \
   -f packaging/tests/deb/nodejs/Dockerfile \
   .

packaging/tests/shared/dotnet/test.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-ls -lah *
-
 dotnet DotNetTestApp.dll &
 
 # If the .NET process is instrumented successfully, we should see a log report: