You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2020/01/08 10:05:31 UTC
[incubator-dlab] 01/01: Fixed issue with building DLab docker images
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch epmrc1-1411
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6ba5b2593cdf38c90ca104fb9f673f8b64cf9460
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Jan 8 12:05:20 2020 +0200
Fixed issue with building DLab docker images
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 9 +++++++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 70561c5..2fcb6f2 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -192,7 +192,7 @@ dlab_path = /opt/dlab/
### Elastic IP which will be associated with SSN node
# elastic_ip =
### Version of Docker to be installed on SSN
-docker_version = 17.09.0
+docker_version = 18.06.3
### Name of hosted zone for Route53
# hosted_zone_name =
### ID of hosted zone
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 145b7fb..5a62d3a 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -41,7 +41,7 @@ def ensure_docker_daemon(dlab_path, os_user, region):
stable"')
sudo('apt-get update')
sudo('apt-cache policy docker-ce')
- sudo('apt-get install -y docker-ce={}~ce-0~ubuntu'.format(docker_version))
+ sudo('apt-get install -y docker-ce={}~ce~3-0~ubuntu'.format(docker_version))
sudo('usermod -a -G docker ' + os_user)
sudo('update-rc.d docker defaults')
sudo('update-rc.d docker enable')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 7176c8b..727f97e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -55,6 +55,7 @@ def modify_conf_file(args):
sudo("python /tmp/configure_conf_file.py --dlab_dir {} --variables_list '{}'".format(
args.dlab_path, json.dumps(variables_list)))
+
def download_toree():
toree_path = '/opt/dlab/sources/infrastructure-provisioning/src/general/files/os/'
tarball_link = 'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/toree-0.2.0-incubating-bin.tar.gz'
@@ -69,6 +70,7 @@ def download_toree():
print('Failed to download toree: ', str(err))
sys.exit(1)
+
def add_china_repository(dlab_path):
with cd('{}sources/infrastructure-provisioning/src/base/'.format(dlab_path)):
sudo('sed -i "/pip install/s/$/ -i https\:\/\/{0}\/simple --trusted-host {0} --timeout 60000/g" '
@@ -106,6 +108,7 @@ def build_docker_images(image_list, region, dlab_path):
except:
return False
+
def configure_guacamole():
try:
mysql_pass = id_generator()
@@ -174,8 +177,10 @@ if __name__ == "__main__":
sys.exit(1)
print("Building dlab images")
- if not build_docker_images(deeper_config, args.region, args.dlab_path):
- sys.exit(1)
+ count = 0
+ while not build_docker_images(deeper_config, args.region, args.dlab_path) and count < 5:
+ count += 1
+ time.sleep(5)
print("Configuring guacamole")
if not configure_guacamole():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org