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

Jump to bottom

Users/balaga gayatri/multi container master #171

Merged
merged 14 commits into from
Jun 10, 2021
Merged

Users/balaga gayatri/multi container master #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a56dccd
added multicontainer support for linux
BALAGA-GAYATRI Jun 8, 2021
7f6f412
resolve conflicts
BALAGA-GAYATRI Jun 9, 2021
3efbcf5
Merge branch 'master' into users/balaga-gayatri/multi-container-master
BALAGA-GAYATRI Jun 10, 2021
d010f9e
Update PublishProfileWebAppValidator.js
BALAGA-GAYATRI Jun 10, 2021
118b78d
Update SpnLinuxContainerWebAppValidator.js
BALAGA-GAYATRI Jun 10, 2021
03d4848
Update SpnWindowsContainerWebAppValidator.js
BALAGA-GAYATRI Jun 10, 2021
b17e40c
Update SpnWindowsWebAppValidator.js
BALAGA-GAYATRI Jun 10, 2021
438e625
Update WebAppContainerDeployment.js
BALAGA-GAYATRI Jun 10, 2021
80d21f4
Update Validations.js
BALAGA-GAYATRI Jun 10, 2021
7998558
Update Validations.js
BALAGA-GAYATRI Jun 10, 2021
a6e9297
Update PublishProfileWebAppContainerDeploymentProvider.js
BALAGA-GAYATRI Jun 10, 2021
02eadcb
Update PublishProfileContainerWebAppValidator.js
BALAGA-GAYATRI Jun 10, 2021
1e26cfe
added necessary conditions
BALAGA-GAYATRI Jun 9, 2021
382d949
Merge branch 'users/balaga-gayatri/multi-container-master' of github.…
BALAGA-GAYATRI Jun 10, 2021
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 lib/ActionInputValidator/ValidatorFactory.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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