Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add ffmpeg as requirement
Roland Geiderfbec3be16d9a
diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.ymlindex 0982adf65..f68782e62 100644--- a/.github/workflows/docker-base.yml+++ b/.github/workflows/docker-base.yml@@ -1,10 +1,13 @@name: Build and push base Docker images-on: workflow_dispatch--# on:-# schedule:-# - cron: '0 5 1 * *'+on:+ push:+ branches:+ - "master"+ paths:+ - 'extras/docker/base/Dockerfile'+ schedule:+ - cron: '0 5 1 * *'jobs:path-context:diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfileindex 60031c563..221af3069 100644--- a/extras/docker/base/Dockerfile+++ b/extras/docker/base/Dockerfile@@ -24,6 +24,7 @@ RUN apt-get update \python3-pip \sqlite3 \netcat-openbsd \+ ffmpeg \&& rm -rf /var/lib/apt/lists/* \&& npm install -g [email protected] sass\&& locale-gen en_US.UTF-8diff --git a/requirements.txt b/requirements.txtindex 67e423cfc..fec1d047b 100644--- a/requirements.txt+++ b/requirements.txt@@ -18,6 +18,7 @@ invoke~=1.6pillow~=9.0reportlab==3.6.5requests==2.27.1+ffmpeg-python~=0.2.0# AWS#boto3diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex f8509f494..46554b483 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -181,7 +181,7 @@ $(document).ready(function() {{% endfor %}</div>- {% if perms.exercises.change_exercisevideo %}+ {% if allow_upload_videos and perms.exercises.change_exercisevideo %}<p><a href="{% url 'exercise:video:add' exercise.id %}" >{% translate "Add new video" %}diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex f50de2611..0046b81e9 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -158,6 +158,7 @@ def view(request, id, slug=None):template_data['json'] = chart_datatemplate_data['svg_uuid'] = str(uuid.uuid4())template_data['cache_vary_on'] = "{}-{}".format(exercise.id, load_language().id)+ template_data['allow_upload_videos'] = settings.WGER_SETTINGS['ALLOW_UPLOAD_VIDEOS']return render(request, 'exercise/view.html', template_data)diff --git a/wger/settings_global.py b/wger/settings_global.pyindex f9947adf2..927578dab 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -436,6 +436,7 @@ WGER_SETTINGS = {'REMOVE_WHITESPACE': False,'ALLOW_REGISTRATION': True,'ALLOW_GUEST_USERS': True,+ 'ALLOW_UPLOAD_VIDEOS': False,'EMAIL_FROM': 'wger Workout Manager <[email protected]>','TWITTER': False}