From c532c3c380f046c04bc0a9684ddf82d384250afd Mon Sep 17 00:00:00 2001
From: Cristian Goina <goinac@janelia.hhmi.org>
Date: Tue, 27 Feb 2024 18:58:30 -0500
Subject: [PATCH 1/4] IPP updates

---
 containers/ipp/Dockerfile       | 1 -
 containers/ipp/VERSION          | 2 +-
 containers/ipp/requirements.txt | 7 ++++++-
 containers/ipp/start.sh         | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/containers/ipp/Dockerfile b/containers/ipp/Dockerfile
index 23965a7..8b19eb1 100644
--- a/containers/ipp/Dockerfile
+++ b/containers/ipp/Dockerfile
@@ -22,4 +22,3 @@ EXPOSE 8000
 CMD [ "uwsgi", \
     "--ini", "/app/ipp.ini", \
     "--uid", "uwsgi" ]
-
diff --git a/containers/ipp/VERSION b/containers/ipp/VERSION
index 26aaba0..f0bb29e 100644
--- a/containers/ipp/VERSION
+++ b/containers/ipp/VERSION
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git a/containers/ipp/requirements.txt b/containers/ipp/requirements.txt
index a5bb492..f99eaaa 100644
--- a/containers/ipp/requirements.txt
+++ b/containers/ipp/requirements.txt
@@ -1,3 +1,4 @@
+Jinja2==2.10
 Flask==1.0.2
 Flask-Admin==1.5.3
 Flask-Login==0.4.1
@@ -8,7 +9,11 @@ flask-mongoengine==0.9.5
 Flask-DebugToolbar==0.10.1
 Flask-DebugToolbar-Mongo==0.1
 Flask-Script==2.0.6
-ipdb==0.11
+ipdb==0.13
 python-dateutil==2.7.3
 pytz==2018.5
+uwsgi
 requests==2.20.0
+werkzeug==0.16.1
+markupsafe==2.0.1
+itsdangerous==2.0.1
diff --git a/containers/ipp/start.sh b/containers/ipp/start.sh
index 7ba8d75..d4f3f9e 100755
--- a/containers/ipp/start.sh
+++ b/containers/ipp/start.sh
@@ -2,4 +2,3 @@
 cd /app/lightsheet-pipeline
 source env/bin/activate
 ./env/bin/uwsgi --ini /app/ipp.ini
-

From fcfb6b1f0dfcad6f69d3c0c800533285e9374689 Mon Sep 17 00:00:00 2001
From: Cristian Goina <goinac@janelia.hhmi.org>
Date: Tue, 27 Feb 2024 19:18:18 -0500
Subject: [PATCH 2/4] update python path

---
 containers/ipp/ipp.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/ipp/ipp.ini b/containers/ipp/ipp.ini
index 3890600..64c3bbe 100644
--- a/containers/ipp/ipp.ini
+++ b/containers/ipp/ipp.ini
@@ -10,7 +10,7 @@ plugin-dir = /usr/lib/uwsgi
 plugin = python3
 
 pythonpath = %(chdir)
-pythonpath = /usr/local/lib/python3.6/site-packages
+pythonpath = /usr/local/lib/python3.8/site-packages
 
 master =  true
 processes = 3

From e5f11362c6ac5d7e117c5948102fe9eae67e25eb Mon Sep 17 00:00:00 2001
From: Cristian Goina <goinac@janelia.hhmi.org>
Date: Wed, 28 Feb 2024 12:48:38 -0500
Subject: [PATCH 3/4] updated api gateway nginx conf

---
 containers/jacs-init/VERSION                           | 2 +-
 containers/jacs-init/filesystem/api-gateway/nginx.conf | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/containers/jacs-init/VERSION b/containers/jacs-init/VERSION
index 9edc58b..9f05f9f 100644
--- a/containers/jacs-init/VERSION
+++ b/containers/jacs-init/VERSION
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/containers/jacs-init/filesystem/api-gateway/nginx.conf b/containers/jacs-init/filesystem/api-gateway/nginx.conf
index 47fdae4..9ec8da2 100644
--- a/containers/jacs-init/filesystem/api-gateway/nginx.conf
+++ b/containers/jacs-init/filesystem/api-gateway/nginx.conf
@@ -232,8 +232,5 @@ http {
             uwsgi_read_timeout 300;
             include uwsgi_params;
         }
-        location /static {
-            alias /app/ipp;
-        }
     }
 }

From 1bd1c3ee50105d177e1f1cbde9f898d62781f807 Mon Sep 17 00:00:00 2001
From: porterbot <schauderd@janelia.hhmi.org>
Date: Thu, 29 Feb 2024 10:46:02 -0500
Subject: [PATCH 4/4] updated for 9.18.5 patch

---
 containers/jacs-async/VERSION             | 2 +-
 containers/jacs-compute/VERSION           | 2 +-
 containers/workstation-site-horta/VERSION | 2 +-
 containers/workstation-site/VERSION       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/containers/jacs-async/VERSION b/containers/jacs-async/VERSION
index ae2351f..81fb8f2 100644
--- a/containers/jacs-async/VERSION
+++ b/containers/jacs-async/VERSION
@@ -1 +1 @@
-9.18.3
+9.18.5
diff --git a/containers/jacs-compute/VERSION b/containers/jacs-compute/VERSION
index ae2351f..81fb8f2 100644
--- a/containers/jacs-compute/VERSION
+++ b/containers/jacs-compute/VERSION
@@ -1 +1 @@
-9.18.3
+9.18.5
diff --git a/containers/workstation-site-horta/VERSION b/containers/workstation-site-horta/VERSION
index ae2351f..81fb8f2 100644
--- a/containers/workstation-site-horta/VERSION
+++ b/containers/workstation-site-horta/VERSION
@@ -1 +1 @@
-9.18.3
+9.18.5
diff --git a/containers/workstation-site/VERSION b/containers/workstation-site/VERSION
index ae2351f..81fb8f2 100644
--- a/containers/workstation-site/VERSION
+++ b/containers/workstation-site/VERSION
@@ -1 +1 @@
-9.18.3
+9.18.5