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 8116544  [odahu-integration] Bugfixing
8116544 is described below

commit 8116544118fefea31cedf47c0cf913ce52d10c20
Author: Demyan Mysakovets <[email protected]>
AuthorDate: Wed Apr 15 18:34:34 2020 +0300

    [odahu-integration] Bugfixing
---
 infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py 
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 73111f1..284d796 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -95,12 +95,10 @@ 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))
-        sudo('mkdir /home/{}/.docker'.format(os_user))
-        with open('/home/{}/.docker/config.json'.format(os_user), 'w') as f:
+        with open('/tmp/config', 'w') as f:
             f.write(base64.b64decode(gcr_creds) + "==")
+        sudo('mkdir /home/{}/.docker'.format(os_user))
+        local('scp -i {} /tmp/config 
{}:/home/{}/.docker/config.json'.format(args.keyfile, env.host_string, os_user))
         #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))


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

Reply via email to