This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2320
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2320 by this push:
new e4e7dda [DATALAB-2320]: added error message and output redirect to
/dev/null
e4e7dda is described below
commit e4e7dda194b752dec92f0f6d2558f42cf5a89dfe
Author: leonidfrolov <[email protected]>
AuthorDate: Thu May 20 12:34:47 2021 +0300
[DATALAB-2320]: added error message and output redirect to /dev/null
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 7 +++++--
infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 0b83289..f80a4fd 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -643,11 +643,14 @@ def pull_docker_images():
'azure': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'deeplearning',
'dataengine']
}
- conn.sudo('export $NEXUS_PASSWORD={} 2>&1
'.format(args.repository_pass))
- conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{} 2>&1'
+ conn.sudo('export $NEXUS_PASSWORD={} 2>&1 >
/dev/null'.format(args.repository_pass))
+ try:
+ conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{} 2>&1 >
/dev/null'
.format(args.repository_user,
args.repository_address,
args.repository_port))
+ except:
+ print('Failed docker login. ')
for image in list_images[args.cloud_provider]:
conn.sudo('docker pull {0}:{1}/docker.datalab-{3}-{2}'
.format(args.repository_address,
args.repository_port, args.cloud_provider, image))
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
index bfdd666..7ce9f8c 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
@@ -387,12 +387,15 @@ def pull_docker_images():
ensure_file = ('/home/{}/.ensure_dir/docker_images_pulled'
.format(args.os_user))
if not exists(conn, ensure_file):
- conn.sudo('export $NEXUS_PASSWORD={} 2>&1
'.format(args.repository_pass))
- conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{} 2>&1'
+ conn.sudo('export $NEXUS_PASSWORD={} 2>&1 >
/dev/null'.format(args.repository_pass))
+ try:
+ conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{} 2>&1'
.format(args.repository_user,
args.repository_pass,
args.repository_address,
args.repository_port))
+ except:
+ print('Failed docker login. ')
conn.sudo('docker pull {}:{}/docker.datalab-base-{}'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker pull {}:{}/docker.datalab-edge-{}'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
