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 cb8fd16 [odahu-integration] Bugfix
cb8fd16 is described below
commit cb8fd16284f87959860149a678f1e95c99dd7d87
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Tue Mar 17 15:38:46 2020 +0200
[odahu-integration] Bugfix
---
.../src/ssn/scripts/configure_docker.py | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 0146cbe..92ff80e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -81,16 +81,11 @@ def add_china_repository(dlab_path):
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
def login_in_gcr(gcr_creds):
- try:
- with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
- f.write(gcr_creds)
- local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
- sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
- sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
- except Exception as err:
- traceback.print_exc()
- print('Failed to prepare odahu image: ', str(err))
- sys.exit(1)
+ with open('/tmp/dlab-gcr-ro-sa', 'w') as f:
+ f.write(gcr_creds)
+ local('scp -i {} /tmp/dlab-gcr-ro-sa
{}:/tmp/dlab-gcr-ro-sa'.format(args.keyfile, env.host_string))
+ sudo('cat /tmp/dlab-gcr-ro-sa | base64 --decode >
/tmp/dlab-gcr-ro-sa.json')
+ sudo('cat /tmp/dlab-gcr-ro-sa.json | docker login -u _json_key
--password-stdin https://gcr.io')
def build_docker_images(image_list, region, dlab_path):
try:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
