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 2022/10/26 14:25:23 UTC
[incubator-datalab] branch epm-v2.5.2.1 updated (7d3e75943 -> 8723bd2e8)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
from 7d3e75943 fixed service account parsing bug
new 58afc0cf3 [DATALAB-3096]: specified guacamole/guacamole tag
new 8723bd2e8 [DATALAB-3096]: moved tag to variable in datalab.ini
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/src/general/conf/datalab.ini | 3 +++
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 8 +++++---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 6 +++---
3 files changed, 11 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: [DATALAB-3096]: specified guacamole/guacamole tag
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 58afc0cf398e9962ccce45ea91dca83c7bb70bef
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Oct 26 13:18:43 2022 +0300
[DATALAB-3096]: specified guacamole/guacamole tag
---
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 6 +++---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index e3794403d..698125405 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -150,7 +150,7 @@ def configure_guacamole():
try:
mysql_pass = id_generator()
conn.sudo('docker run --name guacd --restart unless-stopped -d -p 4822:4822 guacamole/guacd')
- conn.sudo('docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql')
+ conn.sudo('docker run --rm guacamole/guacamole:1.4.0 /opt/guacamole/bin/initdb.sh --mysql > initdb.sql')
conn.sudo('mkdir /tmp/scripts')
conn.sudo('cp initdb.sql /tmp/scripts')
conn.sudo('mkdir /opt/mysql')
@@ -167,7 +167,7 @@ def configure_guacamole():
.format(mysql_pass))
conn.sudo("docker run --name guacamole --restart unless-stopped --link guacd:guacd --link guac-mysql:mysql" \
" -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='{}'" \
- " -d -p 8080:8080 guacamole/guacamole".format(mysql_pass))
+ " -d -p 8080:8080 guacamole/guacamole:1.4.0".format(mysql_pass))
# create cronjob for run containers on reboot
conn.sudo('mkdir /opt/datalab/cron')
conn.sudo('touch /opt/datalab/cron/mysql.sh')
@@ -177,7 +177,7 @@ def configure_guacamole():
conn.sudo('bash -c "echo \"docker rm guacamole\" >> /opt/datalab/cron/mysql.sh"')
conn.sudo('''bash -c "echo \\"docker run --name guacamole --restart unless-stopped --link guacd:guacd --link ''' \
'''guac-mysql:mysql -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='{}' '''\
- '''-d -p 8080:8080 guacamole/guacamole\\" >> /opt/datalab/cron/mysql.sh"'''.format(mysql_pass))
+ '''-d -p 8080:8080 guacamole/guacamole:1.4.0\\" >> /opt/datalab/cron/mysql.sh"'''.format(mysql_pass))
conn.sudo("bash -c '(crontab -l 2>/dev/null; echo \"@reboot sh /opt/datalab/cron/mysql.sh\") | crontab -'")
return True
except Exception as err:
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 5682b2e7f..1bb6d11e9 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -675,7 +675,7 @@ def configure_guacamole():
try:
mysql_pass = id_generator()
conn.sudo('docker run --name guacd --restart unless-stopped -d -p 4822:4822 guacamole/guacd')
- conn.sudo('docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql')
+ conn.sudo('docker run --rm guacamole/guacamole:1.4.0 /opt/guacamole/bin/initdb.sh --mysql > initdb.sql')
conn.sudo('mkdir /tmp/scripts')
conn.sudo('cp initdb.sql /tmp/scripts')
conn.sudo('mkdir -p /opt/mysql')
@@ -693,7 +693,7 @@ def configure_guacamole():
.format(mysql_pass))
conn.sudo("docker run --name guacamole --restart unless-stopped --link guacd:guacd --link guac-mysql:mysql"
" -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='{}'"
- " -d -p 8080:8080 guacamole/guacamole".format(mysql_pass))
+ " -d -p 8080:8080 guacamole/guacamole:1.4.0".format(mysql_pass))
# create cronjob for run containers on reboot
conn.sudo('mkdir -p /opt/datalab/cron')
conn.sudo('touch /opt/datalab/cron/mysql.sh')
@@ -704,7 +704,7 @@ def configure_guacamole():
conn.sudo('echo "docker rm guacamole" >> /opt/datalab/cron/mysql.sh')
conn.sudo("""echo "docker run --name guacamole --restart unless-stopped --link guacd:guacd"""
""" --link guac-mysql:mysql -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' """
- """-e MYSQL_PASSWORD='{}' -d -p 8080:8080 guacamole/guacamole" >> """
+ """-e MYSQL_PASSWORD='{}' -d -p 8080:8080 guacamole/guacamole:1.4.0" >> """
"""/opt/datalab/cron/mysql.sh""".format(mysql_pass))
conn.sudo('''/bin/bash -c '(crontab -l 2>/dev/null; echo "@reboot sh /opt/datalab/cron/mysql.sh") |'''
''' crontab - ' ''')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-3096]: moved tag to variable in datalab.ini
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 8723bd2e80d90515e65cf5f3554cb014ff1fad01
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Oct 26 15:16:55 2022 +0300
[DATALAB-3096]: moved tag to variable in datalab.ini
---
infrastructure-provisioning/src/general/conf/datalab.ini | 3 +++
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 02b5f4937..0cda67a6c 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -274,6 +274,9 @@ docker_version = 20.10.2
# subdomain =
### Role ARN for creating Route53 record
# assume_role_arn =
+### guacamole/guacamole image tag
+guacamole_image_tag = 1.4.0
+
#--- [edge] section contains all parameters that are using for edge node provisioning ---#
[edge]
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 698125405..e11ee85fa 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -150,7 +150,8 @@ def configure_guacamole():
try:
mysql_pass = id_generator()
conn.sudo('docker run --name guacd --restart unless-stopped -d -p 4822:4822 guacamole/guacd')
- conn.sudo('docker run --rm guacamole/guacamole:1.4.0 /opt/guacamole/bin/initdb.sh --mysql > initdb.sql')
+ conn.sudo('docker run --rm guacamole/guacamole:{} /opt/guacamole/bin/initdb.sh --mysql > initdb.sql'
+ .format(os.environ['ssn_guacamole_image_tag']))
conn.sudo('mkdir /tmp/scripts')
conn.sudo('cp initdb.sql /tmp/scripts')
conn.sudo('mkdir /opt/mysql')
@@ -167,7 +168,7 @@ def configure_guacamole():
.format(mysql_pass))
conn.sudo("docker run --name guacamole --restart unless-stopped --link guacd:guacd --link guac-mysql:mysql" \
" -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='{}'" \
- " -d -p 8080:8080 guacamole/guacamole:1.4.0".format(mysql_pass))
+ " -d -p 8080:8080 guacamole/guacamole:{}".format(mysql_pass, os.environ['ssn_guacamole_image_tag']))
# create cronjob for run containers on reboot
conn.sudo('mkdir /opt/datalab/cron')
conn.sudo('touch /opt/datalab/cron/mysql.sh')
@@ -177,7 +178,8 @@ def configure_guacamole():
conn.sudo('bash -c "echo \"docker rm guacamole\" >> /opt/datalab/cron/mysql.sh"')
conn.sudo('''bash -c "echo \\"docker run --name guacamole --restart unless-stopped --link guacd:guacd --link ''' \
'''guac-mysql:mysql -e MYSQL_DATABASE='guacamole' -e MYSQL_USER='guacamole' -e MYSQL_PASSWORD='{}' '''\
- '''-d -p 8080:8080 guacamole/guacamole:1.4.0\\" >> /opt/datalab/cron/mysql.sh"'''.format(mysql_pass))
+ '''-d -p 8080:8080 guacamole/guacamole:{}\\" >> /opt/datalab/cron/mysql.sh"'''
+ .format(mysql_pass, os.environ['ssn_guacamole_image_tag']))
conn.sudo("bash -c '(crontab -l 2>/dev/null; echo \"@reboot sh /opt/datalab/cron/mysql.sh\") | crontab -'")
return True
except Exception as err:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org