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 10:19:06 UTC
[incubator-datalab] 01/01: [DATALAB-3096]: specified guacamole/guacamole tag
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-3096
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 61ccf306f3c9c5d6998dcf4c8343e211176b4f47
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 c27382c69..490d67d14 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -676,7 +676,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')
@@ -694,7 +694,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')
@@ -705,7 +705,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