You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/02/24 09:29:17 UTC
[incubator-datalab] branch DATALAB-2091 updated: [DATALAB-2091]:
changed some docker build commands
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2091 by this push:
new d08ad31 [DATALAB-2091]: changed some docker build commands
d08ad31 is described below
commit d08ad31509377780c2f4cdd13984122320f744eb
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 24 11:28:34 2021 +0200
[DATALAB-2091]: changed some docker build commands
---
.../src/ssn/scripts/configure_docker.py | 23 +++++++---------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index a9369b9..a4a6a8a 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -126,24 +126,15 @@ def build_docker_images(image_list, region, datalab_path):
for image in image_list:
name = image['name']
tag = image['tag']
- print('=======')
- print('== ' + args.datalab_path)
- print('== ' + args.cloud_provider)
- print('== ' + name)
- conn.sudo('ls -lah {0}; ls -lah {0}sources/infrastructure-provisioning/src/general/files/gcp/'.format(args.datalab_path))
- conn.sudo('cd {0}sources/infrastructure-provisioning/src/; cp general/files/{1}/{2}_description.json '
- '{2}/description.json'.format(args.datalab_path, args.cloud_provider, name))
+ conn.sudo('cp {0}sources/infrastructure-provisioning/src/general/files/{1}/{2}_description.json '
+ '{0}sources/infrastructure-provisioning/src/{2}/description.json'.format(args.datalab_path, args.cloud_provider, name))
if name == 'base':
- conn.sudo("cd {4}sources/infrastructure-provisioning/src/; docker build --build-arg OS={2} "
- "--build-arg SRC_PATH="" --file general/files/{3}/{0}_Dockerfile "
- "-t docker.datalab-{0}:{1} .".format(name, tag, args.os_family, args.cloud_provider,
- args.datalab_path))
+ conn.sudo('docker build --build-arg OS={2} --build-arg SRC_PATH="" --file '
+ '{4}sources/infrastructure-provisioning/src/general/files/{3}/{0}_Dockerfile -t '
+ 'docker.datalab-{0}:{1} .'.format(name, tag, args.os_family, args.cloud_provider, args.datalab_path))
else:
- conn.sudo("cd {4}sources/infrastructure-provisioning/src/; docker build --build-arg OS={2} "
- "--file general/files/{3}/{0}_Dockerfile -t docker.datalab-{0}:{1} .".format(name, tag,
- args.os_family,
- args.cloud_provider,
- args.datalab_path))
+ conn.sudo("docker build --build-arg OS={2} --file {4}sources/infrastructure-provisioning/src/general/files/{3}/{0}_Dockerfile "
+ "-t docker.datalab-{0}:{1} .".format(name, tag, args.os_family, args.cloud_provider, args.datalab_path))
conn.sudo('rm -f {}sources/infrastructure-provisioning/src/base/azure_auth.json'.format(args.datalab_path))
return True
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org