Merge pull request 'develop' (#10) from develop into master
Reviewed-on: michele/Map#10
12
.dockerignore
Normal file
|
@ -0,0 +1,12 @@
|
|||
# directories
|
||||
**/bin/
|
||||
**/obj/
|
||||
**/out/
|
||||
|
||||
# files
|
||||
Dockerfile*
|
||||
**/*.trx
|
||||
**/*.md
|
||||
**/*.ps1
|
||||
**/*.cmd
|
||||
**/*.sh
|
8
.editorconfig
Normal file
|
@ -0,0 +1,8 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = false
|
||||
insert_final_newline = false
|
44
.vscode/launch.json
vendored
|
@ -2,16 +2,50 @@
|
|||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": ".NET Core Launch (console)",
|
||||
"name": "Docker .NET Core Attach (Preview)",
|
||||
"type": "docker",
|
||||
"request": "attach",
|
||||
"platform": "netCore",
|
||||
"sourceFileMap": {
|
||||
"/": "${workspaceFolder}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Sledgemapper",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
"program": "${workspaceFolder}/MyGame/bin/Debug/netcoreapp3.1/MyGame.dll",
|
||||
"preLaunchTask": "build sledgemapper",
|
||||
"program": "${workspaceFolder}/Sledgemapper/bin/Debug/net5.0/sledgemapper.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/MyGame",
|
||||
"cwd": "${workspaceFolder}/Sledgemapper",
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false
|
||||
},
|
||||
{
|
||||
"name": "Sledgemapper.API",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build sledgemapper.api",
|
||||
"program": "${workspaceFolder}/Sledgemapper.Api/bin/Debug/net5.0/sledgemapper.api.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/Sledgemapper.Api",
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false,
|
||||
"env": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Identity.API",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build identity",
|
||||
"program": "${workspaceFolder}/Identity/bin/Debug/netcoreapp3.1/WebApi.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/Identity",
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false
|
||||
},
|
||||
|
|
45
.vscode/tasks.json
vendored
|
@ -2,16 +2,55 @@
|
|||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "build",
|
||||
|
||||
"label": "build identity",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/MyGame/MyGame.csproj",
|
||||
"${workspaceFolder}/Identity/WebApi.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
"problemMatcher": "$msCompile",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
"label": "build sledgemapper",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/Sledgemapper/Sledgemapper.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
"label": "build sledgemapper.api",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/Sledgemapper.Api/Sledgemapper.Api.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "publish",
|
||||
|
|
59
Dockerfile
Normal file
|
@ -0,0 +1,59 @@
|
|||
# https://hub.docker.com/_/microsoft-dotnet-core
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
|
||||
WORKDIR /src
|
||||
|
||||
# copy csproj and restore as distinct layers
|
||||
#COPY *.sln .
|
||||
# COPY SignalRChat/*.csproj ./aspnetapp/
|
||||
# WORKDIR /source/aspnetapp
|
||||
# RUN dotnet restore
|
||||
COPY Sledgemapper.Api/*.csproj ./Sledgemapper.Api/
|
||||
COPY Sledgemapper.Shared/*.csproj ./Sledgemapper.Shared/
|
||||
|
||||
WORKDIR /src/Sledgemapper.Api
|
||||
RUN dotnet restore
|
||||
|
||||
WORKDIR /src/Sledgemapper.Shared
|
||||
RUN dotnet restore
|
||||
|
||||
# copy everything else and build app
|
||||
WORKDIR /src
|
||||
COPY Sledgemapper.Api/. ./Sledgemapper.Api/
|
||||
COPY Sledgemapper.Shared/. ./Sledgemapper.Shared/
|
||||
WORKDIR /src/Sledgemapper.Api
|
||||
RUN dotnet publish -c release -o /app --no-restore
|
||||
|
||||
# final stage/image
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:5.0
|
||||
WORKDIR /app
|
||||
COPY --from=build /app ./
|
||||
ENTRYPOINT ["dotnet", "SignalRChat.dll"]
|
||||
|
||||
|
||||
# # https://hub.docker.com/_/microsoft-dotnet-core
|
||||
# FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
|
||||
|
||||
# # copy csproj and restore as distinct layers
|
||||
# #COPY *.sln .
|
||||
# WORKDIR /source
|
||||
# COPY Sledgemapper.Api/*.csproj ./Sledgemapper.Api/
|
||||
# WORKDIR /source/Sledgemapper.Api
|
||||
# RUN dotnet restore
|
||||
|
||||
# WORKDIR /source
|
||||
# COPY Sledgemapper.Shared/*.csproj ./Sledgemapper.Shared/
|
||||
# WORKDIR /source/Sledgemapper.Shared
|
||||
# RUN dotnet restore
|
||||
|
||||
# # copy everything else and build app
|
||||
# WORKDIR /source
|
||||
# COPY Sledgemapper.Api/. ./Sledgemapper.Api/
|
||||
# COPY Sledgemapper.Shared/. ./Sledgemapper.Shared/
|
||||
# WORKDIR /source/Sledgemapper.Api
|
||||
# RUN dotnet publish -c release -o /app --no-restore
|
||||
|
||||
# # final stage/image
|
||||
# FROM mcr.microsoft.com/dotnet/aspnet:5.0
|
||||
# WORKDIR /app
|
||||
# COPY --from=build /app ./
|
||||
# ENTRYPOINT ["dotnet", "Sledgemapper.Api.dll"]
|
Before Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 9 KiB |
Before Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 8 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 9.8 KiB |
Before Width: | Height: | Size: 8.6 KiB |
Before Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 9.8 KiB |
Before Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 8.8 KiB |
Before Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 8 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 12 KiB |