From d6feaafca7238596cda68a3febf590998bdb62dd Mon Sep 17 00:00:00 2001
From: Jack Scanlon <63121833+JackScanlon@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:06:14 +0000
Subject: [PATCH] fix(release): patch deployment (#1769)

Co-authored-by: ieuans <ieuanscanlon@hotmail.co.uk>
Co-authored-by: alexcoldea <alexcoldea3@gmail.com>
Co-authored-by: Alex Coldea <32749167+alexcoldea@users.noreply.github.com>
Co-authored-by: Muhammad A Elmessary <33552352+elmessary@users.noreply.github.com>
Co-authored-by: Arthur zinnurov <zinnurov_2012@mail.ru>
Co-authored-by: elmessary <muhammad.elmessary@swansea.ac.uk>
Co-authored-by: roshantoby@gmail.com <R0$#@n1995>
Co-authored-by: roshantoby <roshantoby@gmail.com>
---
 docker/app/config/cll.supervisord.conf |  7 +++----
 docker/app/scripts/deploy-site.sh      | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docker/app/config/cll.supervisord.conf b/docker/app/config/cll.supervisord.conf
index db3908c67..9717891ff 100644
--- a/docker/app/config/cll.supervisord.conf
+++ b/docker/app/config/cll.supervisord.conf
@@ -12,7 +12,6 @@ user=root
 priority=1
 directory=/var/www/concept_lib_sites/v1/CodeListLibrary_project
 command=/home/config_cll/init/app-start.sh
-startsecs=10
 autostart=true
 autorestart=unexpected
 startretries=5
@@ -25,7 +24,7 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 
 [program:engagelens]
-user=www-data
+user=root
 numprocs=1
 priority=2
 directory=/var/www/concept_lib_sites/v1/engagelens
@@ -43,7 +42,7 @@ stdout_logfile=/home/config_cll/cll_srvr_logs/engagelens.supervisord.log
 stdout_logfile_maxbytes=50MB
 
 [program:celeryworker]
-user=www-data
+user=root
 numprocs=1
 priority=2
 directory=/var/www/concept_lib_sites/v1/CodeListLibrary_project
@@ -61,7 +60,7 @@ stdout_logfile=/home/config_cll/cll_srvr_logs/celeryworker.supervisord.log
 stdout_logfile_maxbytes=50MB
 
 [program:celerybeat]
-user=www-data
+user=root
 numprocs=1
 priority=2
 directory=/var/www/concept_lib_sites/v1/CodeListLibrary_project
diff --git a/docker/app/scripts/deploy-site.sh b/docker/app/scripts/deploy-site.sh
index aa439f496..5ae100235 100644
--- a/docker/app/scripts/deploy-site.sh
+++ b/docker/app/scripts/deploy-site.sh
@@ -14,6 +14,12 @@ export https_proxy;
 app_port='80';
 export app_port;
 
+start_engagelens='True';
+export start_engagelens;
+
+cll_healthcheck_addr='fullaccess-app';
+export cll_healthcheck_addr;
+
 cll_backend_name='cllnet';
 export cll_backend_name;
 
@@ -23,7 +29,7 @@ export cll_host_binding;
 cll_grace_period='3s';
 export cll_grace_period;
 
-cll_log_path='/cl_log';
+cll_log_path='/root/cl_log';
 export cll_log_path;
 
 ## 3. Redis-related
@@ -46,13 +52,13 @@ DetachedMode=true;
 
 ## 2. Image registry target(s)
 ###  - cll/app image registry URL + target, e.g. site:port/target/target:version
-LibraryRegistry='';
+LibraryRegistry='<url>:<version>';
 
 ## 3. Docker preferences
 ###  - Specifies the Docker profile to use (if any)
-Profile='';
+Profile='live';
 ###  - Specifies the Docker project name to use
-ProjectName='main_demo';
+ProjectName='cll';
 ###  - Specifies the cll/app image name
 LibraryImageName='cll/app:latest';
 
@@ -139,7 +145,7 @@ docker tag $LibraryRegistry $(printf '%s' "$LibraryImageName")
 
 
 # Kill current app
-docker-compose -p "$ProjectName" -f "$ComposeFile" --profile "*" down --volumes;
+docker compose -p "$ProjectName" -f "$ComposeFile" --profile "*" down --volumes;
 
 
 # Start the containers