ignored files

johndavedecano · Mar 25, 2020 · eb4c8cb · eb4c8cb
1 parent 216aeae
commit eb4c8cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,5 @@
 node_modules
 *.log
 Dockerfile
-docker-compose.yml
+docker-compose.yml
+media
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-*.log
+*.log
+media
diff --git a/Dockerfile b/Dockerfile
@@ -16,18 +16,8 @@ RUN yarn install --silent
 
 RUN yarn global add nodemon
 
-RUN echo "FFMPEG installed at: $(which ffmpeg)"
-RUN echo "NODEJS installed at: $(which node)"
-RUN echo "FFMPEG version is: $(ffmpeg -version)"
-RUN echo "NODEJS version is: $(node -v)"
-RUN echo "YARN version is: $(yarn -v)"
-
 RUN which ffmpeg
 
-RUN export FFMPEG_PATH=$(which ffmpeg)
-
-RUN export MEDIA_ROOT=/app/media
-
 EXPOSE 8000
 
 EXPOSE 1935
diff --git a/src/config.js b/src/config.js
@@ -9,10 +9,10 @@ module.exports = {
   http: {
     port: 8000,
     allow_origin: '*',
-    mediaroot: process.env.MEDIA_ROOT,
+    mediaroot: process.env.MEDIA_ROOT || '/app/media',
   },
   relay: {
-    ffmpeg: process.env.FFMPEG_PATH,
+    ffmpeg: process.env.FFMPEG_PATH || '/usr/bin/ffmpeg',
     tasks: [
       {
         app: 'stream',