Skip to content

Commit 49b8fce

Browse files
committed
Updating to .net 9
1 parent d0911ec commit 49b8fce

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

.github/workflows/dotnet-core-docker.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: cd eform-angular-frontend && docker build . -t microtingas/frontend-container:latest --build-arg GITVERSION=1.0.0
2424
shell: bash
2525
- run: docker save microtingas/frontend-container:latest -o container.tar
26-
- uses: actions/upload-artifact@v2
26+
- uses: actions/upload-artifact@v3
2727
with:
2828
name: container
2929
path: container.tar
@@ -147,7 +147,7 @@ jobs:
147147
- name: Setup .NET Core
148148
uses: actions/setup-dotnet@v3
149149
with:
150-
dotnet-version: 8.0.x
150+
dotnet-version: 9.0.x
151151
- name: Install dependencies
152152
run: dotnet restore eform-angular-frontend/eFormAPI/eFormAPI.sln
153153
- name: Build
@@ -170,7 +170,7 @@ jobs:
170170
ref: stable
171171
path: eform-angular-outer-inner-resource-plugin
172172
- name: 'Preparing Frontend checkout'
173-
uses: actions/checkout@v2
173+
uses: actions/checkout@v3
174174
with:
175175
repository: microting/eform-angular-frontend
176176
ref: stable
@@ -189,7 +189,7 @@ jobs:
189189
docker build . -t microtingas/outer-inner-resource-container:latest --build-arg GITVERSION=1.0.0 --build-arg PLUGINVERSION=1.0.0
190190
shell: bash
191191
- run: docker save microtingas/outer-inner-resource-container:latest -o outer-inner-resource-container.tar
192-
- uses: actions/upload-artifact@v2
192+
- uses: actions/upload-artifact@v3
193193
with:
194194
name: outer-inner-resource-container
195195
path: outer-inner-resource-container.tar
@@ -226,7 +226,7 @@ jobs:
226226
with:
227227
node-version: 20
228228
- name: 'Preparing Frontend checkout'
229-
uses: actions/checkout@v2
229+
uses: actions/checkout@v3
230230
with:
231231
repository: microting/eform-angular-frontend
232232
ref: stable
@@ -254,7 +254,6 @@ jobs:
254254
cp -av eform-angular-outer-inner-resource-plugin/eform-client/e2e/Tests/outer-inner-resource-general eform-angular-frontend/eform-client/e2e/Tests/outer-inner-resource-general
255255
cp -av eform-angular-outer-inner-resource-plugin/eform-client/e2e/Page\ objects/OuterInnerResource eform-angular-frontend/eform-client/e2e/Page\ objects/OuterInnerResource
256256
cp -av eform-angular-outer-inner-resource-plugin/eform-client/wdio-headless-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-headless-plugin-step2.conf.ts
257-
cp -av eform-angular-outer-inner-resource-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts
258257
#mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins
259258
#cp -av eform-angular-outer-inner-resource-plugin/eFormAPI/eFormAPI.Web/Plugins/OuterInnerResource eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins/OuterInnerResource
260259
cd eform-angular-frontend/eform-client && ../../eform-angular-outer-inner-resource-plugin/testinginstallpn.sh
@@ -324,7 +323,7 @@ jobs:
324323
- name: Setup .NET Core
325324
uses: actions/setup-dotnet@v3
326325
with:
327-
dotnet-version: 8.0.x
326+
dotnet-version: 9.0.x
328327
- name: Build
329328
run: dotnet build eform-angular-outer-inner-resource-plugin/eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.sln
330329
- name: Unit Tests
@@ -342,7 +341,7 @@ jobs:
342341
- name: Setup .NET Core
343342
uses: actions/setup-dotnet@v3
344343
with:
345-
dotnet-version: 8.0.x
344+
dotnet-version: 9.0.x
346345
- name: Install dependencies
347346
run: dotnet restore eform-debian-service
348347
- name: Build
@@ -387,7 +386,7 @@ jobs:
387386
docker tag microtingas/outer-inner-resource-service-container:latest microtingas/outer-inner-resource-service-container:latest
388387
docker tag microtingas/outer-inner-resource-service-container:${{ steps.get_release_version.outputs.VERSION }} microtingas/outer-inner-resource-service-container:${{ steps.get_release_version.outputs.VERSION }}
389388
- run: docker save microtingas/outer-inner-resource-service-container:latest -o outer-inner-resource-service-container.tar
390-
- uses: actions/upload-artifact@v2
389+
- uses: actions/upload-artifact@v3
391390
with:
392391
name: outer-inner-resource-service-container
393392
path: outer-inner-resource-service-container.tar
@@ -398,10 +397,6 @@ jobs:
398397
- uses: actions/checkout@v3
399398
with:
400399
path: main
401-
- uses: actions/download-artifact@v3
402-
with:
403-
name: outer-inner-resource-service-container
404-
- run: docker load -i outer-inner-resource-service-container.tar
405400
- name: Create docker network 🖧
406401
run: docker network create --driver bridge data
407402
- name: Start MariaDB
@@ -412,6 +407,10 @@ jobs:
412407
run: |
413408
docker pull rabbitmq:latest
414409
docker run -d --hostname my-rabbit --name some-rabbit --network data -e RABBITMQ_DEFAULT_USER=admin -e RABBITMQ_DEFAULT_PASS=password rabbitmq:latest
410+
- uses: actions/download-artifact@v3
411+
with:
412+
name: outer-inner-resource-service-container
413+
- run: docker load -i outer-inner-resource-service-container.tar
415414
- name: Load DB dump
416415
run: |
417416
docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'create database `420_SDK`'
@@ -466,7 +465,7 @@ jobs:
466465
- name: Setup .NET Core
467466
uses: actions/setup-dotnet@v3
468467
with:
469-
dotnet-version: 8.0.x
468+
dotnet-version: 9.0.x
470469
- name: Load DB dump
471470
run: |
472471
docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'create database `420_SDK`'
@@ -494,7 +493,7 @@ jobs:
494493
id: get_release_version
495494
run: echo ::set-output name=VERSION::$(cd main && git describe --abbrev=0 --tags | cut -d "v" -f 2)
496495
- name: Login to DockerHub
497-
uses: docker/login-action@v2
496+
uses: docker/login-action@v3
498497
with:
499498
username: ${{ secrets.DOCKERHUB_USERNAME }}
500499
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -523,7 +522,7 @@ jobs:
523522
id: get_release_version
524523
run: echo ::set-output name=VERSION::$(cd main && git describe --abbrev=0 --tags | cut -d "v" -f 2)
525524
- name: Login to DockerHub
526-
uses: docker/login-action@v2
525+
uses: docker/login-action@v3
527526
with:
528527
username: ${{ secrets.DOCKERHUB_USERNAME }}
529528
password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get -y -q install ca-certificates
77
RUN yarn install
88
RUN yarn build
99

10-
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
10+
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
1111
WORKDIR /app
1212
ARG GITVERSION
1313
ARG PLUGINVERSION
@@ -19,7 +19,7 @@ RUN dotnet publish eFormAPI.Web -o eFormAPI.Web/out /p:Version=$GITVERSION --run
1919
RUN dotnet publish OuterInnerResource.Pn -o OuterInnerResource.Pn/out /p:Version=$PLUGINVERSION --runtime linux-x64 --configuration Release
2020

2121
# Build runtime image
22-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
22+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
2323
WORKDIR /app
2424
COPY --from=build-env /app/eFormAPI.Web/out .
2525
RUN mkdir -p ./Plugins/OuterInnerResource.Pn

Dockerfile-service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
22
ARG GITVERSION
33
WORKDIR /app
44
ARG GITVERSION
@@ -14,7 +14,7 @@ RUN ls -lah out
1414
RUN ls -lah out/Plugins
1515

1616
# Build runtime image
17-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
17+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
1818
WORKDIR /app
1919
COPY --from=build-env /app/out .
2020

0 commit comments

Comments
 (0)