You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/08/09 13:02:50 UTC
[incubator-datalab] branch DATALAB-408 updated: [DATALAB-408]:
changed parameters to str from bool
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-408
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-408 by this push:
new f266acb [DATALAB-408]: changed parameters to str from bool
f266acb is described below
commit f266acbe381496d31e16240dd0de6d130888b397
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Aug 9 16:02:41 2021 +0300
[DATALAB-408]: changed parameters to str from bool
---
infrastructure-provisioning/scripts/deploy_datalab.py | 6 +++---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index cdc975c..9eba556 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -169,9 +169,9 @@ parser.add_argument('--conf_repository_address', type=str, default='',
help='address to access repository (used for jars download)')
parser.add_argument('--conf_repository_port', type=str, default='',
help='port to access repository (used for jars download)')
-parser.add_argument('--conf_download_jars', type=bool, default=False,
+parser.add_argument('--conf_download_jars', type=str, default='false',
help='whether to download jars from repository (True) or to build from sources (False)')
-parser.add_argument('--conf_download_docker_images', type=bool, default=False,
+parser.add_argument('--conf_download_docker_images', type=str, default='false',
help='whether to download docker images from repository (True) or to build from sources (False)')
parser.add_argument('--conf_letsencrypt_domain_name', type=str, default='', help='Domain names to apply. '
'For multiple domains enter a comma separated list of domains as a parameter'
@@ -212,7 +212,7 @@ def generate_docker_command():
def build_docker_images(args):
- if args.conf_repository_user and args.conf_repository_pass and args.conf_repository_port and args.conf_repository_address and args.conf_download_docker_images:
+ if args.conf_repository_user and args.conf_repository_pass and args.conf_repository_port and args.conf_repository_address and args.conf_download_docker_images == 'true':
subprocess.run( 'sudo docker login -u {0} -p {1} {2}:{3}'
.format(args.conf_repository_user, args.conf_repository_pass, args.conf_repository_address, args.conf_repository_port), shell=True, check=True)
subprocess.run('sudo docker pull {}:{}/docker.datalab-base-{}'.format(args.conf_repository_address, args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index b153c01..3a1f062 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -121,7 +121,7 @@ def build_docker_images(image_list, region, datalab_path):
'/home/{1}/keys/azure_auth.json'.format(args.datalab_path, args.os_user))
if region == 'cn-north-1':
add_china_repository(datalab_path)
- if 'conf_repository_user' in os.environ and 'conf_repository_port' in os.environ and 'conf_repository_pass' in os.environ and 'conf_repository_address' in os.environ and os.environ['conf_download_docker_images']:
+ if 'conf_repository_user' in os.environ and 'conf_repository_port' in os.environ and 'conf_repository_pass' in os.environ and 'conf_repository_address' in os.environ and os.environ['conf_download_docker_images'] == 'true':
conn.sudo('sudo docker login -u {0} -p {1} {2}:{3}'
.format(os.environ['conf_repository_user'], os.environ['conf_repository_pass'], os.environ['conf_repository_address'], os.environ['conf_repository_port']))
for image in image_list:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org