[incubator-datalab] 01/01: [DATALAB-3099]: updated openresty version, moved to datalab.ini

[lf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-3099
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 5352db125268b794f5e8eb51e680894d25cfe15a
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Nov 7 17:19:47 2022 +0200

    [DATALAB-3099]: updated openresty version, moved to datalab.ini
---
 infrastructure-provisioning/src/general/conf/datalab.ini          | 2 ++
 infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 905a7904d..dc7aed031 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -286,6 +286,8 @@ guacamole_image_tag = 1.4.0
 # elastic_ip =
 ### Edge node is NAT
 is_nat = true
+### Edge openresty version
+openresty_version = 1.19.3.2-1~focal1
 
 #--- [notebook] section contains all parameters that are using for all notebooks provisioning ---#
 [notebook]
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 34d12732a..e127d4a8c 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -92,7 +92,7 @@ def install_nginx_lua(edge_ip, nginx_version, keycloak_auth_server_url, keycloak
             datalab.fab.conn.sudo('wget -O - https://openresty.org/package/pubkey.gpg | sudo apt-key add -')
             datalab.fab.conn.sudo('add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"')
             datalab.fab.conn.sudo('apt-get update')
-            datalab.fab.conn.sudo('apt-get -y install openresty=1.19.3.1-1~focal1')
+            datalab.fab.conn.sudo('apt-get -y install openresty={}'.format(os.environ['edge_openresty_version']))
 
             datalab.fab.conn.sudo('''bash -c 'cd /tmp/src/luarocks-3.3.1/ && ./configure' ''')
             datalab.fab.conn.sudo('''bash -c 'cd /tmp/src/luarocks-3.3.1/ && make install' ''')


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org