This is an automated email from the ASF dual-hosted git repository. dmysakovets pushed a commit to branch odahu-integration in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push: new 6a1b48e [odahu-integration] Bugfixing 6a1b48e is described below commit 6a1b48e7b320d01cd02a9134a5ce1fb55d748822 Author: Demyan Mysakovets <demian.mysakove...@gmail.com> AuthorDate: Wed Apr 15 16:57:43 2020 +0300 [odahu-integration] Bugfixing --- .../src/ssn/scripts/configure_docker.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py index 43d94a8..9aff096 100644 --- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py +++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py @@ -95,12 +95,14 @@ def login_in_gcr(os_user, gcr_creds, odahu_image, dlab_path): print('Failed to install gcloud: ', str(err)) sys.exit(1) try: - with open('/tmp/config', 'w') as f: - f.write(gcr_creds) - local('scp -i {} /tmp/config {}:/tmp/config'.format(args.keyfile, env.host_string)) + #with open('/tmp/config', 'w') as f: + # f.write(gcr_creds) + #local('scp -i {} /tmp/config {}:/tmp/config'.format(args.keyfile, env.host_string)) sudo('mkdir /home/{}/.docker'.format(os_user)) - sudo('cat /tmp/config') - sudo('cat /tmp/config | base64 --decode > /home/{}/.docker/config.json'.format(os_user)) + with open('/home/{}/.docker'.format(os_user), 'w') as f: + f.write(base64.b64decode(gcr_creds) + "==") + #sudo('cat /tmp/config') + #sudo('cat /tmp/config | base64 --decode > /home/{}/.docker/config.json'.format(os_user)) sudo('sed -i "s|ODAHU_IMAGE|{}|" {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image, dlab_path)) except Exception as err: traceback.print_exc() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org