Skip to content

Commit fc5e762

Browse files
committed
Update Docker files to use .NET 8 images
1 parent 59c51b6 commit fc5e762

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/on-prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Setup .NET
5252
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
5353
with:
54-
dotnet-version: 6.0.x
54+
dotnet-version: 8.0.x
5555

5656
- name: Publish .NET Assemblies
5757
run: |

.github/workflows/on-pullrequest-or-push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
- ".github/**/*.yml"
2424
workflow_dispatch:
2525

26-
env:
26+
env:
2727
DB_PASS: ${{ secrets.DB_PASS }}
2828

2929
jobs:
@@ -49,7 +49,7 @@ jobs:
4949
ACCEPT_EULA: 'Y'
5050
ports:
5151
- 1433:1433
52-
52+
5353
defaults:
5454
run:
5555
shell: pwsh
@@ -60,15 +60,15 @@ jobs:
6060
- name: Setup .NET
6161
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
6262
with:
63-
dotnet-version: 6.0.x
63+
dotnet-version: 8.0.x
6464

6565
- name: Build
6666
run: ./build.ps1 -Command Build -Configuration Release
6767

6868
- name: Run Unit Tests
6969
if: success()
7070
run: ./build.ps1 -Command UnitTest -Configuration Release -Report True
71-
71+
7272
- name: Integration Tests
7373
run: ./build.ps1 -Command IntegrationTest -Configuration Release -Report True
7474
shell: pwsh

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
44
# See the LICENSE and NOTICES files in the project root for more information.
55

6-
#tag 6.0-alpine
7-
FROM mcr.microsoft.com/dotnet/aspnet@sha256:201cedd60cb295b2ebea7184561a45c5c0ee337e37300ea0f25cff5a2c762538
6+
#tag 8.0-alpine
7+
FROM mcr.microsoft.com/dotnet/aspnet@sha256:646b1c5ff36375f35f6149b0ce19ca095f97b4b882b90652801e9fbe82bcfa8a
88
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <[email protected]>"
99
ENV VERSION="2.2.0"
1010
ENV TZ=${TIME_ZONE}
@@ -15,7 +15,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
1515

1616
WORKDIR /app
1717

18-
RUN apk --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 postgresql13-client=~13 jq=~1 icu=~72 gcompat tzdata && \
18+
RUN apk --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 postgresql13-client=~13 jq=~1 icu=~74 gcompat tzdata && \
1919
wget -O /app/DataImport.zip https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/DataImport.Web/versions/${VERSION}/content && \
2020
unzip /app/DataImport.zip -d /app/DataImport && \
2121
cp -r /app/DataImport/DataImport.Web/. /app/DataImport.Web && \

dev.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
44
# See the LICENSE and NOTICES files in the project root for more information.
55

6-
#tag sdk:6.0-alpine
7-
FROM mcr.microsoft.com/dotnet/sdk@sha256:c1a73b72c02e7b837e9a93030d545bc4181193e1bab1033364ed2d00986d78ff AS build
6+
# tag sdk:8.0 alpine
7+
FROM mcr.microsoft.com/dotnet/sdk@sha256:e646d8a0fa589bcd970e0ebde394780398e8ae08fffeb36781753c51fc9e87b0 AS build
88
WORKDIR /source
99

1010
COPY DataImport.Web/*.csproj DataImport.Web/
@@ -13,8 +13,8 @@ COPY DataImport.Models/*.csproj DataImport.Models/
1313
COPY DataImport.Common/*.csproj DataImport.Common/
1414
COPY DataImport.EdFi/*.csproj DataImport.EdFi/
1515
COPY logging.json logging.json
16-
COPY logging_PgSql.json logging_PgSql.json
17-
COPY logging_Sql.json logging_Sql.json
16+
COPY logging_PgSql.json logging_PgSql.json
17+
COPY logging_Sql.json logging_Sql.json
1818
RUN dotnet restore DataImport.Server.TransformLoad/DataImport.Server.TransformLoad.csproj
1919
RUN dotnet restore DataImport.Web/DataImport.Web.csproj
2020

@@ -33,8 +33,8 @@ WORKDIR /source/DataImport.Server.TransformLoad
3333
RUN dotnet build -c Release --no-restore
3434
RUN dotnet publish -c Release --no-build -o /app/DataImport.Server.TransformLoad
3535

36-
#tag aspnet:6.0-alpine
37-
FROM mcr.microsoft.com/dotnet/aspnet@sha256:5d7911e8485a58ac50eefa09e2cea8f3d59268fd7f1501f72324e37e29d9d6ee
36+
#tag 8.0-alpine
37+
FROM mcr.microsoft.com/dotnet/aspnet@sha256:646b1c5ff36375f35f6149b0ce19ca095f97b4b882b90652801e9fbe82bcfa8a
3838
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <[email protected]>"
3939
# Alpine image does not contain Globalization Cultures library so we need to install ICU library to get for LINQ expression to work
4040
# Disable the globaliztion invariant mode (set in base image)

0 commit comments

Comments
 (0)