Merge branch 'master' into stable

JaneliaSciComp · Feb 29, 2024 · 1ec90ab · 1ec90ab
2 parents 3f80dc5 + 1bd1c3e
commit 1ec90ab
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git 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

diff --git 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
@@ -2,4 +2,3 @@
 cd /app/lightsheet-pipeline
 source env/bin/activate
 ./env/bin/uwsgi --ini /app/ipp.ini
-
diff --git 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
@@ -1 +1 @@
-9.18.3
+9.18.5
diff --git 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
@@ -232,8 +232,5 @@ http {
             uwsgi_read_timeout 300;
             include uwsgi_params;
         }
-        location /static {
-            alias /app/ipp;
-        }
     }
 }
diff --git 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
@@ -1 +1 @@
-9.18.3
+9.18.5
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,3 @@ EXPOSE 8000
		CMD [ "uwsgi", \
		"--ini", "/app/ipp.ini", \
		"--uid", "uwsgi" ]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@
		cd /app/lightsheet-pipeline
		source env/bin/activate
		./env/bin/uwsgi --ini /app/ipp.ini