From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Tue, 28 Aug 2018 23:21:23 +0000 (+0900)
Subject: Add ffmpeg buildpack for scalingo (#8500)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ad94e1d50a1a13951d82aefcba97f581c54ca70a;p=mastodon.git

Add ffmpeg buildpack for scalingo (#8500)

* Add ffmpeg buildpack for scalingo.

* Add environment variable to install ffprobe

Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable.
---

diff --git a/.buildpacks b/.buildpacks
index c232c712f..3450683ce 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,3 +1,4 @@
 https://github.com/heroku/heroku-buildpack-apt
+https://github.com/Scalingo/ffmpeg-buildpack
 https://github.com/Scalingo/nodejs-buildpack
 https://github.com/Scalingo/ruby-buildpack
diff --git a/scalingo.json b/scalingo.json
index 873731ac9..dd8fb5530 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -91,6 +91,11 @@
       "description": "Internal scalingo configuration",
       "required": true,
       "value": "https://github.com/Scalingo/multi-buildpack.git"
+    },
+    "WITH_FFPROBE": {
+      "description": "Internal scalingo configuration to install ffprobe",
+      "required": true,
+      "value": "true"
     }
   },
   "scripts": {