Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/publish-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}
16 changes: 16 additions & 0 deletions DockerfileDev-dotnet
Original file line number Diff line number Diff line change
@@ -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