Merge remote-tracking branch 'origin/main'

install.sh

@@ -42,5 +42,4 @@ fi
 bash "$HOME/medicine-config/dashboard/install.sh"
 EOF
 
-echo "Готово."
+echo "Готово"
-echo "Для применения membership в группе docker может понадобиться перелогиниться пользователем medicine."

medicine/docker-compose.yml

@@ -27,9 +27,6 @@ services:
   app:
     <<: *common-params
     container_name: medicine-app
-    environment:
-      UWSGI_PROCESSES: ${UWSGI_PROCESSES:-2}
-      UWSGI_THREADS: ${UWSGI_THREADS:-4}
     ports:
       - "${NGINX_HTTP_PORT:-80}:80"
       - "${NGINX_HTTPS_PORT:-443}:443"
@@ -37,6 +34,4 @@ services:
   tasks:
     <<: *common-params
     container_name: medicine-tasks
-    command: /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord-tasks.conf
+    command: /entrypoint-tasks.sh
-    environment:
-      CELERY_WORKER_CONCURRENCY: ${CELERY_WORKER_CONCURRENCY:-2}

postgres/docker-compose.yml

@@ -33,4 +33,4 @@ services:
       driver: "json-file"
       options:
         max-size: "5m"
-        max-file: "5"
+        max-file: "10"