This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1657
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit bf0e5399af1007a59efb2dd37b62b1504d1e15b5
Author: leonidfrolov <[email protected]>
AuthorDate: Tue Mar 24 10:45:34 2020 +0200

    [DLAB-1657]: added endpoint name to notebook image name
---
 .../src/general/scripts/aws/common_prepare_notebook.py              | 4 ++--
 .../src/general/scripts/azure/common_prepare_notebook.py            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index dda26bc..d161b2b 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -94,8 +94,8 @@ if __name__ == "__main__":
         else:
             notebook_config['expected_image_name'] = 
'{0}-{1}-{2}-notebook-image'.format(
                 notebook_config['service_base_name'], 
notebook_config['endpoint_name'], os.environ['application'])
-        notebook_config['notebook_image_name'] = (lambda x: 
'{0}-{1}-{2}-{3}'.format(
-            notebook_config['service_base_name'], 
notebook_config['project_name'], os.environ['application'],
+        notebook_config['notebook_image_name'] = (lambda x: 
'{0}-{1}-{2}-{3}-{4}'.format(
+            notebook_config['service_base_name'], 
notebook_config['project_name'], notebook_config['endpoint_name'], 
os.environ['application'],
             os.environ['notebook_image_name']) if (x != 'None' and x != '')
             else 
notebook_config['expected_image_name'])(str(os.environ.get('notebook_image_name')))
         print('Searching pre-configured images')
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
index de99cbd..a4dda9d 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
@@ -109,9 +109,9 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 notebook_config['application'])
-        notebook_config['notebook_image_name'] = (lambda x: 
'{0}-{1}-{2}-{3}'.format(
-            notebook_config['service_base_name'], 
notebook_config['project_name'], os.environ['application'],
-            os.environ['notebook_image_name']).replace('_', '-') if (x != 
'None' and x != '')
+        notebook_config['notebook_image_name'] = (lambda x: 
'{0}-{1}-{2}-{3}-{4}'.format(
+            notebook_config['service_base_name'], 
notebook_config['project_name'], notebook_config['endpoint_name'],
+            os.environ['application'], 
os.environ['notebook_image_name']).replace('_', '-') if (x != 'None' and x != 
'')
             else 
notebook_config['expected_image_name'])(str(os.environ.get('notebook_image_name')))
         print('Searching pre-configured images')
         notebook_config['image_name'] = 
os.environ['azure_{}_image_name'.format(os.environ['conf_os_family'])]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to