Merge d1a5cd0 into 064251c

Azure · Oct 9, 2018 · 53a837d · 53a837d
2 parents 064251c + d1a5cd0
commit 53a837d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...e-source/container-image-source-dockerhub/container-image-source-dockerhub.component.html b/...e-source/container-image-source-dockerhub/container-image-source-dockerhub.component.html
@@ -25,6 +25,11 @@
         <textbox [control] = "dockerHubForm.controls.image"></textbox>
     </div>
 
+    <div *ngIf = "containerImageSourceInfo.container.id === 'single'" class="container-setting-property">
+        <label>{{ 'containerStartupFile' | translate }}</label>
+        <textbox [control] = "dockerHubForm.controls.startupFile"></textbox>
+    </div>
+
     <div *ngIf = "containerImageSourceInfo.container.id !== 'single'">
         <div class="container-setting-property">
             <label>{{ 'containerMultiConfigurationFile' | translate }}</label>

diff --git a/client/src/app/site/container-settings/container-settings-manager.ts b/client/src/app/site/container-settings/container-settings-manager.ts
@@ -672,6 +672,7 @@ export class ContainerSettingsManager {
             return this._fb.group({
                 serverUrl: [ContainerConstants.dockerHubUrl, []],
                 image: [fxVersion ? fxVersion.split('|')[1] : '', this.requiredValidator.validate.bind(this.requiredValidator)],
+                startupFile: [this._getSiteConfigAppCommandLine(siteConfig), []],
             });
         } else {
             return this._fb.group({
@@ -688,6 +689,7 @@ export class ContainerSettingsManager {
                 login: [this._getAppSettingsUsername(appSettings), this.requiredValidator.validate.bind(this.requiredValidator)],
                 password: [this._getAppSettingsPassword(appSettings), this.requiredValidator.validate.bind(this.requiredValidator)],
                 image: [fxVersion ? fxVersion.split('|')[1] : '', this.requiredValidator.validate.bind(this.requiredValidator)],
+                startupFile: [this._getSiteConfigAppCommandLine(siteConfig), []],
             });
         } else {
             return this._fb.group({
@@ -848,11 +850,16 @@ export class ContainerSettingsManager {
 
     private _getAppCommandLineFormData(containerType: ContainerType, containerForm: FormGroup): string {
         const imageSourceType: ImageSourceType = containerForm.controls.imageSource.value;
-        if (containerType === 'single'
-            && (imageSourceType === 'azureContainerRegistry' || imageSourceType === 'privateRegistry')) {
+        if (containerType === 'single') {
             const imageSourceForm = this.getImageSourceForm(containerForm, imageSourceType);
 
-            return imageSourceForm.controls.startupFile.value;
+            if (imageSourceType === 'dockerHub') {
+                const accessType: DockerHubAccessType = imageSourceForm.controls.accessType.value;
+                const dockerHubForm = this.getDockerHubForm(imageSourceForm, accessType);
+                return dockerHubForm.controls.startupFile.value;
+            } else {
+                return imageSourceForm.controls.startupFile.value;
+            }
         }
 
         return '';