Commit e17f2fb5 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Set uWSGI number of workers/threads to a sane default andf fixed pidfile name.... 

Set uWSGI number of workers/threads to a sane default andf fixed pidfile name. Added the restart: unless-stopped rule to the Docker compose
parent 8cc3b9e6

docker-compose-dev.yml

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ services: 
    image: "rosetta/slurmclustermaster"

    container_name: slurmclustermaster

    hostname: slurmclustermaster

    restart: unless-stopped

    environment:

      - SAFEMODE=False

    privileged: true
@@ -15,6 +16,7 @@ services: 
    image: "rosetta/slurmclusterworker"

    container_name: slurmclusterworker

    hostname: slurmclusterworker

    restart: unless-stopped

    environment:

      - SAFEMODE=False

    privileged: true
@@ -27,6 +29,7 @@ services: 
    container_name: standaloneworker

    hostname: standaloneworker

    privileged: true

    restart: unless-stopped

    volumes:

      - ./data/shared:/shared

      - /var/run/docker.sock:/var/run/docker.sock
@@ -35,6 +38,7 @@ services: 
    container_name: dregistry

    hostname: dregistry

    image: "rosetta/dregistry"

    restart: unless-stopped

    volumes:

      - ./data/dregistry:/var/lib/registry
@@ -42,6 +46,7 @@ services: 
    image: "rosetta/postgres"

    container_name: postgres

    hostname: postgres

    restart: unless-stopped

    environment:

      - SAFEMODE=False

    volumes:
@@ -51,6 +56,7 @@ services: 
    image: "rosetta/webapp"

    container_name: webapp

    hostname: webapp

    restart: unless-stopped

    environment:

      - SAFEMODE=False

      - DJANGO_DB_ENGINE="django.db.backends.postgresql_psycopg2"

services/webapp/run_webapp.sh

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ else 
	uwsgi --chdir=/opt/code \

	      --module=rosetta.wsgi \

	      --env DJANGO_SETTINGS_MODULE=rosetta.settings \

	      --master --pidfile=/tmp/project-master.pid \

	      --master --pidfile=/tmp/rosetta-master.pid \

	      --workers 4 \

	      --threads 4 \

	      --socket=127.0.0.1:49152 \

	      --static-map /static=/rosetta/static \

	      --http :8080 \