From b71c3ada562b5b47d6b998a89125cefbc486a363 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 24 Sep 2020 13:44:27 +0200 Subject: [PATCH] deps: use timeside 0.9 image, build locally by default --- Dockerfile | 2 +- app/bin/app.sh | 2 +- app/settings.py | 1 + docker-compose.yml | 6 ++++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7f5a814..d7fcfbf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM parisson/timeside:latest-dev +FROM parisson/timeside:0.9 MAINTAINER Guillaume Pellerin , Thomas fillon diff --git a/app/bin/app.sh b/app/bin/app.sh index 29fdb508..08f98a66 100755 --- a/app/bin/app.sh +++ b/app/bin/app.sh @@ -22,7 +22,7 @@ gid='www-data' # pip install django-debug-toolbar==1.6 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta -pip install -U youtube-dl librosa +pip install -U youtube-dl librosa django-cacheops==4.2 # install plugins /srv/app/bin/setup_plugins.sh diff --git a/app/settings.py b/app/settings.py index 1bdc2d11..bac341cb 100644 --- a/app/settings.py +++ b/app/settings.py @@ -381,3 +381,4 @@ NOTEBOOK_ARGUMENTS = [ SILENCED_SYSTEM_CHECKS = ['fields.W342',] FIRST_YEAR_PUBLISHED = 1857 # Year of patent filing of the 1st sound recorder by Édouard-Léon Scott de Martinville + diff --git a/docker-compose.yml b/docker-compose.yml index 505d909b..31cb94a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,8 @@ search: image: elasticsearch:1.7 app: - image: parisson/telemeta:1.7 + # image: parisson/telemeta:1.7 + build: . volumes: - ./app:/srv/app - ./telemeta:/srv/lib/telemeta/telemeta @@ -70,7 +71,8 @@ app: - "8000:8000" worker: - image: parisson/telemeta:1.7 + # image: parisson/telemeta:1.7 + build: . volumes_from: - app - data -- 2.39.5