Skip to content

Commit

Permalink
Upgraded to new dotnet version and stuff + some docker stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
devedse committed Jan 27, 2017
1 parent 4b33e9d commit 7ca9e57
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,4 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
/Scripts/Docker/DeveMazeGeneratorCoreWebPublish
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ matrix:
dist: trusty
sudo: required
env: CONFIGURATION=Release
services:
- docker
- os: osx
osx_image: xcode8.2 # macOS 10.11
env: CONFIGURATION=Debug
Expand Down Expand Up @@ -126,5 +128,12 @@ script:
# Run tests
- dotnet test -c $CONFIGURATION ./test/DeveMazeGenerator.Tests


deploy:





notifications:
email: false
23 changes: 23 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}\\src\\DeveMazeGeneratorConsole\\bin\\Debug\\netcoreapp1.0\\DeveMazeGeneratorConsole.dll",
"args": [],
"cwd": "${workspaceRoot}",
"externalConsole": false,
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command.pickProcess}"
}
]
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "0.1.0",
"command": "dotnet",
"isShellCommand": true,
"args": [],
"tasks": [
{
"taskName": "build",
"args": [
"${workspaceRoot}\\src\\DeveMazeGeneratorConsole\\project.json"
],
"isBuildCommand": true,
"problemMatcher": "$msCompile"
}
]
}
3 changes: 3 additions & 0 deletions Scripts/Docker/CreateDockerImage.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
robocopy "%~dp0..\..\src\DeveMazeGeneratorWeb\bin\Release\netcoreapp1.0\publish" "%~dp0DeveMazeGeneratorCoreWebPublish" /MIR
docker build -t devedse/devemazegeneratorcore .
pause
3 changes: 3 additions & 0 deletions Scripts/Docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM microsoft/dotnet:latest
ADD DeveMazeGeneratorCoreWebPublish /home/DeveMazeGeneratorCoreWebPublish
CMD ["dotnet", "/home/DeveMazeGeneratorCoreWebPublish/DeveMazeGeneratorWeb.dll"]
3 changes: 3 additions & 0 deletions Scripts/Docker/PublishDockerImage.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docker login
docker push devedse/devemazegeneratorcore:latest
pause
3 changes: 3 additions & 0 deletions Scripts/Docker/PublishWeb.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cd "%~dp0..\..\src\DeveMazeGeneratorWeb\"
dotnet publish -c Release
pause
2 changes: 2 additions & 0 deletions Scripts/Docker/StartDockerImageNormal.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker run -it --rm -p 0.0.0.0:5001:5000 devemazegeneratorcore
pause
1 change: 1 addition & 0 deletions Scripts/Docker/StartDockerImageWithBash.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker run -it --rm devemazegeneratorcore /bin/bash
26 changes: 13 additions & 13 deletions src/DeveMazeGeneratorWeb/project.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"dependencies": {
"DeveMazeGenerator": "*",
"Microsoft.AspNetCore.Mvc": "1.0.1",
"Microsoft.AspNetCore.Routing": "1.0.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
"Microsoft.Extensions.Configuration.Json": "1.0.0",
"Microsoft.Extensions.Logging": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
"Microsoft.AspNetCore.Mvc": "1.1.0",
"Microsoft.AspNetCore.Routing": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
"Microsoft.Extensions.Configuration.FileExtensions": "1.1.0",
"Microsoft.Extensions.Configuration.Json": "1.1.0",
"Microsoft.Extensions.Logging": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0",
"Microsoft.Extensions.Logging.Debug": "1.1.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
"version": "1.1.0",
"type": "platform"
}
},

Expand Down

0 comments on commit 7ca9e57

Please sign in to comment.