Merge pull request #306 from SubstraFoundation/container-improvements

Improvements
Substra · Aug 12, 2020 · fdff659 · fdff659
2 parents e17614f + 7ed07ca
commit fdff659
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 31 deletions.
diff --git a/backend/backend/settings/deps/raven.py b/backend/backend/settings/deps/raven.py
diff --git a/backend/backend/settings/prod.py b/backend/backend/settings/prod.py
@@ -2,7 +2,6 @@
 
 from .common import *
 from .deps.cors import *
-from .deps.raven import *
 from .deps.org import *
 from .deps.restframework import *
 
@@ -48,19 +47,14 @@
     'disable_existing_loggers': False,
     'root': {
         'level': 'WARNING',
-        'handlers': ['sentry'],
+        'handlers': [],
     },
     'formatters': {
         'verbose': {
             'format': '%(levelname)s %(asctime)s %(name)s %(process)d %(thread)d %(message)s'
         },
     },
     'handlers': {
-        'sentry': {
-            'level': 'ERROR',
-            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-            'tags': {'custom-tag': 'x'},
-        },
         'console': {
             'level': 'INFO',
             'class': 'logging.StreamHandler',
@@ -90,17 +84,6 @@
             'handlers': ['console'],
             'propagate': False,
         },
-        # third-party libraries
-        'sentry.errors': {
-            'level': 'INFO',
-            'handlers': ['console'],
-            'propagate': False,
-        },
-        'raven': {
-            'level': 'INFO',
-            'handlers': ['console'],
-            'propagate': False,
-        },
         'hfc': {
             'level': 'WARNING',
             'handlers': ['console'],

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -2,25 +2,24 @@ Django==2.2.13
 celery==4.4.0
 checksumdir==1.1.7
 cryptography>=2.8
-coverage==5.0.3
 django-cors-headers==3.2.1
 django-celery-results==1.1.2
 django-rest-swagger==2.2.0
 djangorestframework==3.11.0
 djangorestframework-simplejwt==4.4.0
-GPUtil==1.4.0
 ipython==7.11.1
 ipython-genutils==0.2.0
 kubernetes==11.0.0
-mock==3.0.5
 psycopg2-binary==2.8.4
-raven==6.10.0
 requests==2.22.0
-sentry-sdk==0.14.1
 tldextract==2.2.2
 uwsgi==2.0.18
 zxcvbn==4.4.28
 boto3==1.11.9
 git+git://github.com/hyperledger/fabric-sdk-py.git@5f6407810f07c6901b10cd3b518dd82aed7482fb
+# dev-mode
 watchdog==0.10.2
 argh==0.26.2
+# tests
+coverage==5.0.3
+mock==3.0.5
diff --git a/docker/celerybeat/Dockerfile b/docker/celerybeat/Dockerfile
@@ -9,6 +9,7 @@ WORKDIR /usr/src/app
 COPY ./backend/requirements.txt /usr/src/app/.
 RUN chown -R ${USER_ID}:${GROUP_ID} /usr/src/app/.
 
+RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 COPY ./backend/libs /usr/src/app/libs

diff --git a/docker/celeryworker/Dockerfile b/docker/celeryworker/Dockerfile
@@ -13,6 +13,7 @@ WORKDIR /usr/src/app
 COPY ./backend/requirements.txt /usr/src/app/.
 RUN chown -R ${USER_ID}:${GROUP_ID} /usr/src/app
 
+RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 COPY ./backend/libs /usr/src/app/libs

diff --git a/docker/flower/Dockerfile b/docker/flower/Dockerfile
@@ -9,6 +9,7 @@ WORKDIR /usr/src/app
 COPY ./backend/requirements.txt /usr/src/app/.
 RUN chown -R ${USER_ID}:${GROUP_ID} /usr/src/app
 
+RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 RUN pip3 install flower
 

diff --git a/docker/substra-backend/Dockerfile b/docker/substra-backend/Dockerfile
@@ -9,6 +9,7 @@ WORKDIR /usr/src/app
 COPY ./backend/requirements.txt /usr/src/app/.
 RUN chown -R ${USER_ID}:${GROUP_ID} /usr/src/app
 
+RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 COPY ./backend/manage.py /usr/src/app/manage.py