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 b55082f [DATALAB-2320]: changed docker login
b55082f is described below
commit b55082f5bf13082fe26b24ca0bfba5a0effcd6f6
Author: leonidfrolov <[email protected]>
AuthorDate: Thu May 20 14:23:14 2021 +0300
[DATALAB-2320]: changed docker login
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 7 ++-----
infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py | 6 +-----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 18cc37b..fcbdf78 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -643,14 +643,11 @@ def pull_docker_images():
'azure': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'deeplearning',
'dataengine']
}
- conn.run('export NEXUS_PASSWORD={} 2>&1 >
/dev/null'.format(args.repository_pass))
- try:
- conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{}'
+ conn.sudo('docker login -u {} -p {} {}:{} 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
docker login.\n=============="'
.format(args.repository_user,
+ args.repository_pass,
args.repository_address,
args.repository_port))
- except:
- print('==============\nFailed docker login.\n==============')
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 cab3b43..0574548 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
@@ -387,15 +387,11 @@ def pull_docker_images():
ensure_file = ('/home/{}/.ensure_dir/docker_images_pulled'
.format(args.os_user))
if not exists(conn, ensure_file):
- conn.run('export NEXUS_PASSWORD={} 2>&1 >
/dev/null'.format(args.repository_pass))
- try:
- conn.sudo('docker login -u {} -p $NEXUS_PASSWORD {}:{} 2>&1'
+ conn.sudo('docker login -u {} -p {} {}:{} 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
docker login.\n=============="'
.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]
