Skip to content

Commit

Permalink
Users/balaga gayatri/multi container master (#171)
Browse files Browse the repository at this point in the history
* added multicontainer support for linux

* resolve conflicts

* Update PublishProfileWebAppValidator.js

* Update SpnLinuxContainerWebAppValidator.js

* Update SpnWindowsContainerWebAppValidator.js

* Update SpnWindowsWebAppValidator.js

* Update WebAppContainerDeployment.js

* Update Validations.js

* Update Validations.js

* Update PublishProfileWebAppContainerDeploymentProvider.js

* Update PublishProfileContainerWebAppValidator.js

* added necessary conditions
  • Loading branch information
BALAGA-GAYATRI authored Jun 10, 2021
1 parent 393f751 commit 05e3bec
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/ActionInputValidator/ValidatorFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ValidatorFactory {
Validations_1.appNameIsRequired(actionParams.appName);
yield this.getResourceDetails(actionParams);
if (!!actionParams.isLinux) {
if (!!actionParams.images) {
if (!!actionParams.images || !!actionParams.multiContainerConfigFile) {
return new SpnLinuxContainerWebAppValidator_1.SpnLinuxContainerWebAppValidator();
}
else {
Expand Down
2 changes: 1 addition & 1 deletion lib/DeploymentProvider/DeploymentProviderFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DeploymentProviderFactory {
}
}
else if (type == BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.SPN) {
if (!!actionparameters_1.ActionParameters.getActionParams().images) {
if (!!actionparameters_1.ActionParameters.getActionParams().images || (!!actionparameters_1.ActionParameters.getActionParams().isLinux && !!actionparameters_1.ActionParameters.getActionParams().multiContainerConfigFile)) {
return new WebAppContainerDeployment_1.WebAppContainerDeploymentProvider(type);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion src/ActionInputValidator/ValidatorFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class ValidatorFactory {
appNameIsRequired(actionParams.appName);
await this.getResourceDetails(actionParams);
if (!!actionParams.isLinux) {
if (!!actionParams.images) {
if (!!actionParams.images || !!actionParams.multiContainerConfigFile) {
return new SpnLinuxContainerWebAppValidator();
}
else {
Expand Down
2 changes: 1 addition & 1 deletion src/DeploymentProvider/DeploymentProviderFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class DeploymentProviderFactory {
}
}
else if(type == DEPLOYMENT_PROVIDER_TYPES.SPN) {
if (!!ActionParameters.getActionParams().images) {
if(!!ActionParameters.getActionParams().images || (!!ActionParameters.getActionParams().isLinux && !!ActionParameters.getActionParams().multiContainerConfigFile)) {
return new WebAppContainerDeploymentProvider(type);
}
else {
Expand Down

0 comments on commit 05e3bec

Please sign in to comment.