Skip to content
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.

Sign up for GitHub

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 web app - support multicontainer #9943

Merged
merged 15 commits into from
Apr 12, 2019
Merged

Azure web app - support multicontainer #9943

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a20c1f6
Multiple images loading
Mar 25, 2019
0cfef74
publishing log file
Mar 27, 2019
eb1afaa
Adding few more changes
Mar 27, 2019
a6f6acc
Changing patch version to pass the checks
Mar 29, 2019
6600994
Resolving comments
Mar 29, 2019
4e54323
Resolving more comments
Mar 29, 2019
ba89d0f
Passing the checks
Mar 29, 2019
3ef5435
Resolving comments
Apr 2, 2019
0a079c2
Making imageName not mandatory
Apr 4, 2019
a8fabeb
Editing tooltips
Apr 9, 2019
bf2d6aa
Resolved merge conflicts
Apr 10, 2019
8d9596c
Changing tooltip of imageName
Apr 10, 2019
5fb01a6
Merge branch 'master' into users/shmittal/multipleContainers
Apr 12, 2019
0a919b7
git commit -m "resolving checks"
Apr 12, 2019
93f1341
Resolving last comment
Apr 12, 2019
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
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppContainerV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppContainerV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 4
"Patch": 5
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 6
"Patch": 7
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFunctionAppV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 6
"Patch": 7
},
"minimumAgentVersion": "2.104.1",
"groups": [
Expand Down
5 changes: 4 additions & 1 deletion Tasks/AzureWebAppContainerV1/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"loc.input.help.slotName": "Enter or Select an existing Slot other than the Production slot.",
"loc.input.label.imageName": "Image name",
"loc.input.help.imageName": "A globally unique top-level domain name for your specific registry or namespace.<br/> Note: Fully qualified image name will be of the format: '<b>`<registry or namespace`></b>/`<repository`>:`<tag`>'. For example, '<b>myregistry.azurecr.io</b>/nginx:latest'.",
"loc.input.label.configFilePath": "Configuration File",
"loc.input.help.configFilePath": "Path of the configuration. Should be fully qualified path or relative to the default working directory.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Path of the Docker-Compose file. Should be a fully qualified path or relative to the default working directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is done.

"loc.input.label.containerCommand": "Startup command ",
"loc.input.label.appSettings": "App settings",
"loc.input.help.appSettings": "Edit web app application settings following the syntax -key value . Value containing spaces should be enclosed in double quotes.<br /> <b>Example</b> : -Port 5000 -RequestTimeout 5000 <br /> -WEBSITE_TIME_ZONE \"Eastern Standard Time\"",
Expand Down Expand Up @@ -175,5 +177,6 @@
"loc.messages.RestartedAppService": "App Service '%s' restarted successfully.",
"loc.messages.RestartedAppServiceSlot": "App Service '%s-%s' restarted successfully.",
"loc.messages.FailedToRestartAppService": "Failed to restart App Service '%s'. Error: %s",
"loc.messages.FailedToRestartAppServiceSlot": "Failed to restart App Service '%s-%s'. Error: %s"
"loc.messages.FailedToRestartAppServiceSlot": "Failed to restart App Service '%s-%s'. Error: %s",
"loc.messages.FailedToGetConfigurationFile": "Failed to get configuration file for multi containers. Please enter the valid configuration file path."
}
Loading