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
5 changes: 3 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/PeerMeeting.Host/bin/Debug/netcoreapp3.1/PeerMeeting.Host.dll",
"program": "${workspaceFolder}/src/PeerMeeting.Host/bin/Debug/net10.0/PeerMeeting.Host.dll",
"args": [],
"cwd": "${workspaceFolder}/src/PeerMeeting.Host",
"stopAtEntry": false,
Expand All @@ -20,7 +20,8 @@
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_URLS": "https://0.0.0.0:5001;http://0.0.0.0:5000"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ COPY . /src
RUN echo $(git describe --tags --always 2>/dev/null | sed 's/-g[a-z0-9]\{7\}//') > /version ;\
echo "Version: "$(cat /version)

FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
COPY . /build
COPY --from=version /version /build/version
WORKDIR /build
RUN apt-get update -yq ;\
apt-get install curl gnupg -yq ;\
curl -sL https://deb.nodesource.com/setup_14.x | bash - ;\
curl -sL https://deb.nodesource.com/setup_20.x | bash - ;\
apt-get install -y nodejs

# Apply calculated version
Expand All @@ -23,8 +23,9 @@ RUN sed -i -e "s/<Version>0-develop<\/Version>/<Version>$(cat version | cut -c2-


######## PeerMeeting Host
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim as app
FROM mcr.microsoft.com/dotnet/aspnet:10.0 as app
COPY --from=build /app /app
WORKDIR /app
ENV ASPNETCORE_URLS=http://*:80
EXPOSE 80
ENTRYPOINT ["dotnet", "PeerMeeting.Host.dll"]
2 changes: 1 addition & 1 deletion src/PeerMeeting.Domain/PeerMeeting.Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/PeerMeeting.Host/ClientApp/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
'eslint:recommended'
],
rules: {
//'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-console': 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
},
parserOptions: {
Expand Down
Loading
Loading