Commit 9f69b5b4 authored by guglielmo's avatar guglielmo

git ignores all .dcenv files

docker image renamed and aligned between docker-compose.yml and .gitlab-ci.yml; uwsgi invocation corrected

constance requirements adjusted

taskmanager urls added
parent 8f66d0f3
......@@ -5,7 +5,7 @@ __pycache__
# Env file
/config/.env
/config/.dcenv
/config/.dcenv*
# Unit test / coverage reports
.coverage
......
......@@ -105,7 +105,7 @@ deploy_staging:
- echo "$CA" > $DOCKER_CERT_PATH/ca.pem
- echo "$CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem
- echo "$CLIENT_KEY" > $DOCKER_CERT_PATH/key.pem
- docker build --compress -t openpolis/sources-verification:latest .
- docker build --compress -t openpolis/opsv:latest .
- docker-compose down
- docker-compose up -d --build
- docker exec opsv_web python manage.py collectstatic --noinput
......
......@@ -12,7 +12,8 @@ urls = [
url(r'^favicon\.ico$', RedirectView.as_view(url='/static/images/favicon.ico')),
url(r'^admin/', admin.site.urls),
url(r'^diff/(?P<content_id>\d+)$', diff, name='diff'),
url(r'^signal/(?P<content_id>\d+)$', signal, name='signal')
url(r'^signal/(?P<content_id>\d+)$', signal, name='signal'),
url(r"^taskmanager/", include("taskmanager.urls")),
]
urlpatterns = urls
......
......@@ -5,7 +5,7 @@ services:
web:
restart: always
container_name: opsv_web
image: openpolis/sources-verification
image: openpolis/opsv
expose:
- "8000"
links:
......@@ -30,7 +30,7 @@ services:
volumes:
- public:/app/public
- weblogs:/var/log
command: /usr/local/bin/uwsgi --socket=:8000 --logto=/var/log/uwsgi.log --env DJANGO_SETTINGS_MODULE=config.settings --pythonpath=/app --module=wsgi --callable=application --processes=4
command: /usr/local/bin/uwsgi --socket=:8000 --master --logto=/var/log/uwsgi.log --env DJANGO_SETTINGS_MODULE=config.settings --pythonpath=/app --module=wsgi --callable=application --processes=4 --spooler=/var/lib/uwsgi --spooler-processes=2
nginx:
restart: always
......
......@@ -12,7 +12,6 @@ django-object-actions
django-admin-row-actions
# live settings
django-constance==2.4.0
django-constance[database]
# slack notifications
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment