-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: update framework to .net 8.0 #9
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0d7a9d7
feat: update framework to .net 8.0
umoelli 09a56f5
build: update Dockerfile at build stage
tjorbo 6f13003
build: rename Dockerfile of db
tjorbo e6162cb
fix: add script user-create.sql
umoelli 4643582
Merge branch 'feature/dotnet-8' of https://github.com/Dataport/termin…
umoelli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| ARG MCR_REGISTRY=mcr.microsoft.com | ||
| FROM ${MCR_REGISTRY}/dotnet/sdk:6.0 AS build | ||
| WORKDIR /src | ||
| ARG MCR_REGISTRY=mcr.microsoft.com/ | ||
|
|
||
| COPY src . | ||
| RUN dotnet restore "Dataport.Terminfinder.WebAPI/Dataport.Terminfinder.WebAPI.csproj" | ||
| RUN dotnet build "Dataport.Terminfinder.WebAPI/Dataport.Terminfinder.WebAPI.csproj" -c Release -o /app/build | ||
| RUN dotnet publish "Dataport.Terminfinder.WebAPI/Dataport.Terminfinder.WebAPI.csproj" -c Release -o /app/publish | ||
| FROM ${MCR_REGISTRY}dotnet/sdk:8.0 AS build | ||
| COPY src ./ | ||
| RUN dotnet publish "Dataport.Terminfinder.WebAPI/Dataport.Terminfinder.WebAPI.csproj" -c Release -o /app/publish /p:UseAppHost=false | ||
|
|
||
| ARG MCR_REGISTRY=mcr.microsoft.com | ||
| FROM ${MCR_REGISTRY}/dotnet/aspnet:6.0 | ||
| FROM ${MCR_REGISTRY}dotnet/aspnet:8.0 | ||
| WORKDIR /app | ||
| EXPOSE 80 | ||
|
|
||
| RUN apt-get update | ||
|
|
||
| COPY --from=build /app/publish/ . | ||
| EXPOSE 80 | ||
|
|
||
| CMD ["dotnet", "Dataport.Terminfinder.WebAPI.dll"] | ||
| CMD ["dotnet", "Dataport.Terminfinder.WebAPI.dll", "--dbmigrate"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| ARG REGISTRY=docker.io | ||
|
|
||
| FROM ${REGISTRY}/postgres:latest | ||
|
|
||
| RUN localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8 | ||
| ENV LANG de_DE.utf8 | ||
|
|
||
| WORKDIR /app | ||
| EXPOSE 5432 | ||
|
|
||
| COPY create_user.sql /docker-entrypoint-initdb.d | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| CREATE USER terminfinderadmin WITH | ||
| LOGIN | ||
| NOSUPERUSER | ||
| INHERIT | ||
| NOREPLICATION; | ||
| ALTER USER "terminfinderadmin" WITH PASSWORD 'terminfinderadmin'; | ||
|
|
||
| ALTER USER terminfinderadmin CREATEDB; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
src/Dataport.Terminfinder.BusinessObject/Dataport.Terminfinder.BusinessObject.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unter Windows/WSL2 verursacht die Änderung eine Fehlermeldung. Da das Dockerfile nichts mit der .Net 8 Migration zu tun hat, sollten wir das Thema später betrachten.