Scale the uwsgi container (qgis#399)

* Scale the uwsgi container, remove deprecated version in docker-compose.yml * Add ENABLE_LDAP to the environment variable
Xpirix · May 8, 2024 · 07412e8 · 07412e8
1 parent b023a13
commit 07412e8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/dockerize/.env.template b/dockerize/.env.template
@@ -28,4 +28,7 @@ EMAIL_HOST_PASSWORD=''
 DEFAULT_PLUGINS_SITE='https://plugins.qgis.org/'
 
 # ENV: debug or prod
-QGISPLUGINS_ENV=debug
+QGISPLUGINS_ENV=debug
+
+# Ldap
+ENABLE_LDAP=True
diff --git a/dockerize/Makefile b/dockerize/Makefile
@@ -41,7 +41,7 @@ web: db
 	@echo "------------------------------------------------------------------"
 	@echo "Running in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker compose -p $(PROJECT_ID) up -d uwsgi web worker beat
+	@docker compose -p $(PROJECT_ID) up -d --scale uwsgi=2 web worker beat
 
 dbbackups: db
 	@echo

diff --git a/dockerize/docker-compose.yml b/dockerize/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 volumes:
   postgres_data:
   rabbitmq:
@@ -26,7 +25,6 @@ services:
     restart: unless-stopped
 
   uwsgi: &uwsgi-common
-    container_name: qgis-plugins-uwsgi-common
     build:
       context: ${PWD}/../
       dockerfile: dockerize/docker/Dockerfile
@@ -43,6 +41,7 @@ services:
       - VIRTUAL_HOST=${VIRTUAL_HOST:-plugins.kartoza.com}
       - VIRTUAL_PORT=${VIRTUAL_PORT:-8080}
       - DEBUG=${DEBUG:-False}
+      - ENABLE_LDAP=${ENABLE_LDAP:-False}
       - RABBITMQ_HOST=${RABBITMQ_HOST:-rabbitmq}
       - BROKER_URL=amqp://rabbitmq:5672
       - EMAIL_BACKEND=${EMAIL_BACKEND}

diff --git a/dockerize/docker/uwsgi.conf b/dockerize/docker/uwsgi.conf
@@ -18,5 +18,5 @@ logger = file:/var/log/uwsgi-errors.log
 #uid = 1000
 #gid = 1000
 memory-report = true
-harakiri = 2000
+harakiri = 50
 listen = 127