From 4489bb51f5c987f2e008903d7332f7a35a5598f1 Mon Sep 17 00:00:00 2001
From: Bronco Oostermeyer <dev@bfv.io>
Date: Wed, 21 Jan 2026 09:06:14 +0100
Subject: [PATCH] added dotnet 10

---
 .github/workflows/publish-dev.yaml | 19 +++++++++++++++++++
 DockerfileDev-dotnet               | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 DockerfileDev-dotnet

diff --git a/.github/workflows/publish-dev.yaml b/.github/workflows/publish-dev.yaml
index 9b87b8d..6db73a9 100644
--- a/.github/workflows/publish-dev.yaml
+++ b/.github/workflows/publish-dev.yaml
@@ -66,11 +66,26 @@ jobs:
           echo "${{ secrets[format('PROGRESS_CFG_{0}', env.FLATVERSION)] }}" | base64 --decode > src/progress.cfg
           ls -l src
 
+      - name: Prepare Dockerfile-dotnet
+        run: |
+          oeimage="${{env.IMAGE_NAME}}"
+          dotnetimage="${{env.IMAGE_NAME}}"
+          dotnetimage="${dotnetimage%-dev}-dotnet10-dev"
+          echo "DOTNET_IMAGE_NAME=$dotnetimage" >> $GITHUB_ENV
+          echo OpenEdge version for dotnet image: ${{env.OPENEDGE_VERSION}}
+          sed -i "s|OPENEDGE_ONLY_IMAGE_NAME|$oeimage|g" src/DockerfileDev-dotnet
+          cat src/DockerfileDev-dotnet
+
       - name: Build docker image
         run: |
           cd src
           docker build -f DockerfileDev -t ${{env.IMAGE_NAME}} .
 
+      - name: Build dotnet docker image
+        run: |
+          cd src
+          docker build -f DockerfileDev-dotnet -t ${{env.DOTNET_IMAGE_NAME}}  .
+  
       - name: Remove installer files
         run: |
           cd src
@@ -88,3 +103,7 @@ jobs:
       - name: Push image to registry
         run: |
           docker push ${{env.IMAGE_NAME}}
+
+      - name: Push dotnet image to registry
+        run: |
+          docker push ${{env.DOTNET_IMAGE_NAME}}
diff --git a/DockerfileDev-dotnet b/DockerfileDev-dotnet
new file mode 100644
index 0000000..f818176
--- /dev/null
+++ b/DockerfileDev-dotnet
@@ -0,0 +1,16 @@
+FROM OPENEDGE_ONLY_IMAGE_NAME
+
+USER root
+
+RUN apt update \
+  && apt install -y dotnet-runtime-10.0 \
+  && apt clean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN \
+  sed -i "s/net6\.0/net10\.0/g" /usr/dlc/bin/Progress.clrbridge.netcore.runtimeconfig.json && \
+  sed -i "s/6\.0\.0/10\.0\.0/g" /usr/dlc/bin/Progress.clrbridge.netcore.runtimeconfig.json && \
+  echo "-clrnetcore" >> /usr/dlc/startup.pf
+
+USER openedge
+