Merge branch 'task/2073-dotnet'

iblancasa · Sep 29, 2023 · dafbdd6 · dafbdd6
2 parents a88aa82 + dbb7dca
commit dafbdd6
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 44 deletions.
diff --git a/.github/workflows/publish-autoinstrumentation-e2e-images.yaml b/.github/workflows/publish-autoinstrumentation-e2e-images.yaml
@@ -19,47 +19,14 @@ concurrency:
 
 jobs:
   golang:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-golang
-          tags: |
-            type=ref,event=branch
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          tags: ${{ steps.meta.outputs.tags }}
-          context: tests/instrumentation-e2e-apps/golang
-          platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
-          push: ${{ github.event_name == 'push' }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+    needs: release
+    uses: ./.github/workflows/reusable-publish-autoinstrumentation-e2e-images.yaml
+    with:
+      language: golang
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  dotnet:
+    needs: release
+    uses: ./.github/workflows/reusable-publish-autoinstrumentation-e2e-images.yaml
+    with:
+      language: dotnet
+      platforms: linux/arm64,linux/amd64
diff --git a/.github/workflows/reusable-publish-autoinstrumentation-e2e-images.yaml b/.github/workflows/reusable-publish-autoinstrumentation-e2e-images.yaml
@@ -0,0 +1,58 @@
+name: Reusable - Create operator hub pull request
+
+on:
+  workflow_call:
+    inputs:
+      language:
+        type: string
+        required: true
+      platforms:
+        type: string
+        required: true
+
+jobs:
+  publish-e2e-image:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-${{ inputs.language }}
+          tags: |
+            type=ref,event=branch
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GitHub Package Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          tags: ${{ steps.meta.outputs.tags }}
+          context: tests/instrumentation-e2e-apps/${{ inputs.language }}
+          platforms: ${{ inputs.platforms }}
+          push: ${{ github.event_name == 'push' }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
diff --git a/tests/instrumentation-e2e-apps/dotnet/Dockerfile b/tests/instrumentation-e2e-apps/dotnet/Dockerfile
@@ -0,0 +1,18 @@
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0.400-bookworm-slim-amd64 AS build
+ARG TARGETARCH
+WORKDIR /source
+
+RUN dotnet new webapp -o MyWebApp --no-https -f net7.0
+
+WORKDIR /source/MyWebApp
+RUN dotnet publish -a $TARGETARCH -o /app
+
+FROM mcr.microsoft.com/dotnet/aspnet:7.0.10-bullseye-slim
+
+ENV DOTNET_ROLL_FORWARD=Major
+ENV DOTNET_ROLL_FORWARD_PRE_RELEASE=1
+
+WORKDIR /app
+COPY --from=build /app/ .
+
+ENTRYPOINT ["./MyWebApp"]