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/03/02 11:26:21 UTC
[incubator-datalab] 02/02: [DATALAB-2091]: changed docker images
build
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
commit 80abcf54f0861faf2710a8bdc086b37b0b7df940
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Mar 2 13:25:57 2021 +0200
[DATALAB-2091]: changed docker images build
---
.../src/ssn/scripts/configure_docker.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index bc2a471..458df52 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -129,12 +129,12 @@ def build_docker_images(image_list, region, datalab_path):
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('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))
+ conn.sudo("bash -c '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))
else:
- 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("bash -c '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('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