remove nginx container, downgrade some modules, more threads

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 8183ef7e4a2b3e9b4439e83ad5dbbf359768297e..3b982cbce8e2d118b6cd7b3bec5a1d1c8cf2c6a2 100644 (file)
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # options
-procs=2
-threads=2
+procs=4
+threads=4
 
 # paths
 root='/opt/'

diff --git a/docker-compose.yml b/docker-compose.yml
index 01475ef7018a0d05dbafc8bc10ebad2f9e512287..56ee073affda2b71d94ba54b6ee6183a6a242825 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,14 +27,3 @@ app:
   ports:
     - "8002:8000"
 
-nginx:
-  image: nginx
-  ports:
-    - "8001:80"
-  volumes:
-    - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
-    - ./log/:/var/log/nginx
-  volumes_from:
-    - media
-  links:
-    - app

diff --git a/requirements.txt b/requirements.txt
index 09f491337147f8d80423719fc5236f6bdc13bdbf..8ca95c6656920ff8c04e8ed845a8f4f9a87e5fcb 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ pathlib2==2.3.3
 pathtools==0.1.2
 pexpect==4.7.0
 pickleshare==0.7.5
-Pillow==6.0.0
+Pillow==3.0.0
 prompt-toolkit==1.0.16
 ptyprocess==0.6.0
 Pygments==2.3.1
@@ -42,7 +42,7 @@ python-card-me==0.9.3
 python-dateutil==2.8.0
 pytz==2019.1
 PyYAML==5.1
-reportlab==3.5.20
+reportlab==3.2.0
 requests==2.21.0
 requests-oauthlib==1.2.0
 scandir==1.10.0
@@ -65,4 +65,4 @@ watchdog==0.9.0
 wcwidth==0.1.7
 WebOb==1.8.5
 WebTest==2.0.33
-xhtml2pdf==0.2.3
+xhtml2pdf==0.0.6