-
Notifications
You must be signed in to change notification settings - Fork 88
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
Azure App Service PAAS deployment #65
Merged
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
44b764c
Update Paket.Restore.targets
theprash 217a58b
Move all static content to "public" dir
theprash 2fc4174
#51 Azure deployment
theprash 84c5801
Use dotnetCli variable
theprash 032c0e5
Make ARM deployment location a parameter.
isaacabraham ea20bbb
Merge branch 'master' into azure-deploy
isaacabraham 8151c63
"Deploy" parameter with docker and azure options
theprash 90c6981
Comment template conditionals for better tooling support
theprash 8f68176
Add Azure pricingTier parameter to build script
theprash 88dd727
Fix deploy parameter conditions
theprash 4562ff9
Temporarily turn on DefaultFiles() (pending Saturn PR).
isaacabraham 5ee9c39
Merge branch 'fix-static-content' into azure-deploy
isaacabraham 9ea022d
Merge branch 'azure-deploy' of https://github.com/theprash/SAFE-templ…
isaacabraham 18d195c
Only use public_path env variable with Azure option
theprash 7731284
Microsoft.NET.Sdk.Web project type for Azure option only
theprash 14f7dfa
Remove unnecessary router in Saturn.
isaacabraham 204e23f
Small cleanup of Azure elements in build script (and consistency with…
isaacabraham 2c3f27a
Work on Suave support.
isaacabraham 5917fb8
Final change.
isaacabraham 13d6c2b
Fix web.config getting deployed incorrectly.
isaacabraham 7a9cede
Work on adding Trace Listeners to Suave on Azure.
isaacabraham eb1912c
Start Trace Listener. Still need to figure out how to get Suave to wr…
isaacabraham 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
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,52 @@ | ||
{ | ||
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", | ||
"contentVersion": "1.0.0.0", | ||
"parameters": { | ||
"environment": { "type": "string" }, | ||
"location": { "type": "string" }, | ||
"pricingTier": { "type": "string" } | ||
}, | ||
"variables": { | ||
"appServicePlan": "[concat('safe-', parameters('environment'), '-web-host')]", | ||
"web": "[concat('safe-', parameters('environment'), '-web')]" | ||
}, | ||
"resources": [ | ||
{ | ||
"type": "Microsoft.Web/serverfarms", | ||
"sku": { "name": "[parameters('pricingTier')]" }, | ||
"name": "[variables('appServicePlan')]", | ||
"apiVersion": "2016-09-01", | ||
"location": "[parameters('location')]" | ||
}, | ||
{ | ||
"type": "Microsoft.Web/sites", | ||
"name": "[variables('web')]", | ||
"apiVersion": "2016-08-01", | ||
"location": "[parameters('location')]", | ||
"properties": { | ||
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('appServicePlan'))]" | ||
}, | ||
"dependsOn": [ "[resourceId('Microsoft.Web/serverfarms', variables('appServicePlan'))]" ], | ||
"resources": [ | ||
{ | ||
"name": "appsettings", | ||
"apiVersion": "2015-08-01", | ||
"type": "config", | ||
"properties": { "public_path": "./public" }, | ||
"tags": { "displayName": "WebAppSettings" }, | ||
"dependsOn": [ "[concat('Microsoft.Web/sites/', variables('web'))]" ] | ||
} | ||
] | ||
} | ||
], | ||
"outputs": { | ||
"webAppName": { | ||
"type": "string", | ||
"value": "[variables('web')]" | ||
}, | ||
"webAppPassword": { | ||
"type": "string", | ||
"value": "[list(resourceId('Microsoft.Web/sites/config', variables('web'), 'publishingcredentials'), '2014-06-01').properties.publishingPassword]" | ||
} | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
#if (Deploy == "azure" && Server != "suave") | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
#else | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
#endif | ||
<PropertyGroup> | ||
<OutputType>Exe</OutputType> | ||
<TargetFramework>netcoreapp2.0</TargetFramework> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<Compile Include="..\Shared\Shared.fs" /> | ||
#if (Deploy == "azure" && Server == "suave") | ||
<Compile Include="Azure.fs" /> | ||
#endif | ||
<Compile Include="Server.fs" /> | ||
#if (Deploy == "azure" && Server == "suave") | ||
<None Include="web.config"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
</None> | ||
#endif | ||
</ItemGroup> | ||
<Import Project="..\..\.paket\Paket.Restore.targets" /> | ||
</Project> |
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.
is this change intentional?
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.
I can see you also now use
//#if
instead of#if
in.fsx
script - is that this change that allowed that? Maybe we can get rid of this entry completely then?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.
@theprash one for you.
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.
This change was required to enable templating in the FSPROJ file. I believe the entry is still required for FSX too. The commenting of
#if
was not related to this change.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.
Right, makes sense. So you commented #if in fsx for better editor support? I think I like it this way now