From a102f83324f7c750a3e9c2046e5dfcd0b00e6c94 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nicolas.martinelli@pm.me>
Date: Thu, 1 Aug 2019 14:17:02 +0200
Subject: [PATCH] Docker image: multiple improvements

Use the ffmpeg binary from the apt repository when building the Docker
image.

We also add some minor information on the docker-compose file and the
README.

Related to #27
---
 extra/docker/Dockerfile         | 2 +-
 extra/docker/README.md          | 3 +--
 extra/docker/docker-compose.yml | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/extra/docker/Dockerfile b/extra/docker/Dockerfile
index f30e298c..830285f5 100644
--- a/extra/docker/Dockerfile
+++ b/extra/docker/Dockerfile
@@ -19,6 +19,7 @@ RUN set -x; \
         apt-get install -y --no-install-recommends -qq \
             adduser \
             build-essential \
+            ffmpeg \
             libtag1-dev \
             lsb-base \
             mediainfo \
@@ -81,7 +82,6 @@ RUN set -x; \
         tar xfz koozic-*.tar.gz && \
         rm -rf koozic-*.tar.gz
 RUN set -x; \
-        tar xfz koozic/extra/ffmpeg/ffmpeg-*-64bit.tar.gz -C /usr/local/bin && \
         mv koozic /usr/local/ && \
         chown -R koozic /usr/local/koozic
 
diff --git a/extra/docker/README.md b/extra/docker/README.md
index 26b3252b..f63f660a 100644
--- a/extra/docker/README.md
+++ b/extra/docker/README.md
@@ -1,8 +1,7 @@
 This folder provides a basic Docker configuration using Docker-compose in order to run a fully
 functional KooZic installation. It includes:
 - Ubuntu 18.04
-- KooZic 2.0.0
-- FFmpeg 4.1
+- KooZic v2
 - PostgreSQL from Docker hub
 
 # Set up containers
diff --git a/extra/docker/docker-compose.yml b/extra/docker/docker-compose.yml
index c1eff63f..1f6ba924 100644
--- a/extra/docker/docker-compose.yml
+++ b/extra/docker/docker-compose.yml
@@ -5,7 +5,14 @@ services:
     app:
         container_name: koozic_app
         restart: always
+
+        # Pull the pre-built image from the server:
         image: docmarty84/koozic
+        # Build the image locally (useful to customize the entrypoint.sh file):
+        # build: .
+        # image: koozic_app:latest
+
+        # Change '/music' to the actual location of your music.
         volumes:
             - koozic_app:/home/koozic/.local
             - /music:/mnt/host:ro