This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-408
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-408 by this push:
new c166872 [DATALAB-408]: added repo port and checks if to download
jars/docker images
c166872 is described below
commit c166872eb5b70d7593f283016fce9fd077882e82
Author: leonidfrolov <[email protected]>
AuthorDate: Mon Aug 9 12:25:56 2021 +0300
[DATALAB-408]: added repo port and checks if to download jars/docker images
---
.../scripts/deploy_datalab.py | 24 ++++++++++++++--------
.../src/general/conf/datalab.ini | 2 ++
.../src/ssn/scripts/configure_docker.py | 18 ++++++++--------
.../src/ssn/scripts/configure_ui.py | 2 +-
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py
b/infrastructure-provisioning/scripts/deploy_datalab.py
index f1442de..ad131ea 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -167,6 +167,12 @@ parser.add_argument('--conf_repository_pass', type=str,
default='',
help='password to access repository (used for jars
download)')
parser.add_argument('--conf_repository_address', type=str, default='',
help='address to access repository (used for jars
download)')
+parser.add_argument('--conf_repository_port', type=str, default='',
+ help='port to access repository (used for jars download)')
+parser.add_argument('--conf_download_jars', type=bool, default=False,
+ help='whether to download jars from repository')
+parser.add_argument('--conf_download_docker_images', type=bool, default=False,
+ help='wheher tto download docker images from repository')
parser.add_argument('--conf_letsencrypt_domain_name', type=str, default='',
help='Domain names to apply. '
'For multiple domains enter a comma separated list of domains as a parameter'
'ssn.domain_name will be used for ssn_node, DNS A record have to exist during
deployment')
@@ -206,15 +212,15 @@ def generate_docker_command():
def build_docker_images(args):
- if args.conf_repository_user and args.conf_repository_pass and
args.conf_repository_address:
- subprocess.run( 'sudo docker login -u {0} -p {1} {2}:8083'
- .format(args.conf_repository_user,
args.conf_repository_pass, args.conf_repository_address), shell=True,
check=True)
- subprocess.run('sudo docker pull
{}:8083/docker.datalab-base-{}'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
- subprocess.run('sudo docker image tag {}:8083/docker.datalab-base-{}
docker.datalab-base'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
- subprocess.run('sudo docker image rm
{}:8083/docker.datalab-base-{}'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
- subprocess.run('sudo docker pull
{}:8083/docker.datalab-ssn-{}'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
- subprocess.run('sudo docker image tag {}:8083/docker.datalab-ssn-{}
docker.datalab-ssn'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
- subprocess.run('sudo docker image rm
{}:8083/docker.datalab-ssn-{}'.format(args.conf_repository_address,
args.conf_cloud_provider), shell=True, check=True)
+ if args.conf_repository_user and args.conf_repository_pass and
args.conf_repository_port and args.conf_repository_address and
args.conf_download_docker_images:
+ subprocess.run( 'sudo docker login -u {0} -p {1} {2}:{3}'
+ .format(args.conf_repository_user,
args.conf_repository_pass, args.conf_repository_address,
args.conf_repository_port), shell=True, check=True)
+ subprocess.run('sudo docker pull
{}:{}/docker.datalab-base-{}'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
+ subprocess.run('sudo docker image tag {}:{}/docker.datalab-base-{}
docker.datalab-base'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
+ subprocess.run('sudo docker image rm
{}:{}/docker.datalab-base-{}'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
+ subprocess.run('sudo docker pull
{}:{}/docker.datalab-ssn-{}'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
+ subprocess.run('sudo docker image tag {}:{}/docker.datalab-ssn-{}
docker.datalab-ssn'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
+ subprocess.run('sudo docker image rm
{}:{}/docker.datalab-ssn-{}'.format(args.conf_repository_address,
args.conf_repository_port, args.conf_cloud_provider), shell=True, check=True)
else:
# Building base and ssn docker images
subprocess.run('cd {2}; sudo docker build --build-arg OS={0}
--build-arg SRC_PATH="infrastructure-provisioning/src/" --file '
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini
b/infrastructure-provisioning/src/general/conf/datalab.ini
index f9d2d1b..062a21f 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -91,6 +91,8 @@ private_subnet_prefix = 24
# repository_pass =
### Repository url
# repository_address =
+### Repository port
+# repository_port =
### release tag
# release_tag =
### Deeplearning native cloud AMI enabled
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 253ab25..b153c01 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -121,18 +121,18 @@ def build_docker_images(image_list, region, datalab_path):
'/home/{1}/keys/azure_auth.json'.format(args.datalab_path, args.os_user))
if region == 'cn-north-1':
add_china_repository(datalab_path)
- if 'conf_repository_user' in os.environ and 'conf_repository_pass' in
os.environ and 'conf_repository_address' in os.environ:
- conn.sudo('sudo docker login -u {0} -p {1} {2}:8083'
- .format(os.environ['conf_repository_user'],
os.environ['conf_repository_pass'], os.environ['conf_repository_address']))
+ if 'conf_repository_user' in os.environ and 'conf_repository_port' in
os.environ and 'conf_repository_pass' in os.environ and
'conf_repository_address' in os.environ and
os.environ['conf_download_docker_images']:
+ conn.sudo('sudo docker login -u {0} -p {1} {2}:{3}'
+ .format(os.environ['conf_repository_user'],
os.environ['conf_repository_pass'], os.environ['conf_repository_address'],
os.environ['conf_repository_port']))
for image in image_list:
name = image['name']
tag = image['tag']
- conn.sudo('docker pull {0}:8083/docker.datalab-{2}-{1}:{3}'
- .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag))
- conn.sudo('docker image tag
{0}:8083/docker.datalab-{2}-{1}:{3} docker.datalab-{2}:{3}'
- .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag))
- conn.sudo('docker image rm {0}:8083/docker.datalab-{2}-{1}:{3}'
- .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag))
+ conn.sudo('docker pull {0}:{4}/docker.datalab-{2}-{1}:{3}'
+ .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag,
os.environ['conf_repository_port']))
+ conn.sudo('docker image tag {0}:{4}/docker.datalab-{2}-{1}:{3}
docker.datalab-{2}:{3}'
+ .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag,
os.environ['conf_repository_port']))
+ conn.sudo('docker image rm {0}:{4}/docker.datalab-{2}-{1}:{3}'
+ .format(os.environ['conf_repository_address'],
os.environ['conf_cloud_provider'], name, tag,
os.environ['conf_repository_port']))
return True
else:
for image in image_list:
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 78e0eb9..14997e3 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -161,7 +161,7 @@ def build_ui():
conn.sudo('sudo chown -R {} {}/*'.format(args.os_user,
args.datalab_path))
# Building Back-end
- if 'conf_repository_user' in os.environ and 'conf_repository_pass' in
os.environ and 'conf_repository_address' in os.environ:
+ if 'conf_repository_user' in os.environ and 'conf_repository_pass' in
os.environ and 'conf_repository_address' in os.environ and
os.environ['conf_download_jars']:
conn.sudo(
'wget -P {0}sources/services/provisioning-service/target/
--user={1} --password={2}
https://{3}/repository/packages/{4}/provisioning-service-{4}.jar
--no-check-certificate'
.format(args.datalab_path,
os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
os.environ['conf_repository_address'], os.environ['conf_release_tag']))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
