From cfacd9f770ebdf2d7d885331c0bc1e355dcfd6be Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 28 Jun 2017 20:30:52 +0200
Subject: [PATCH] Updated sample nginx, docker-compose.yml and documentation to
match easier setup for front-end files
---
deploy/docker-compose.yml | 1 +
docs/installation/docker.rst | 2 +-
docs/installation/index.rst | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 1a1b81b3..fadf73d7 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -46,6 +46,7 @@ services:
- ./data/music:/music:ro
- ./data/media:/app/funkwhale_api/media
- ./data/static:/app/staticfiles
+ - ./front/dist:/frontend
ports:
- "${FUNKWHALE_API_IP:-127.0.0.1}:${FUNKWHALE_API_PORT:-5000}:5000"
links:
diff --git a/docs/installation/docker.rst b/docs/installation/docker.rst
index 9f7a288f..76958fb0 100644
--- a/docs/installation/docker.rst
+++ b/docs/installation/docker.rst
@@ -46,7 +46,7 @@ Then launch the whole thing:
docker-compose up -d
-Now, you just need to setup the :ref:`frontend files <frontend-setup>`, and configure your :ref:`reverse-proxy <reverse-proxy-setup>`. Don't worry, it's quite easy.
+Now, you just need to configure your :ref:`reverse-proxy <reverse-proxy-setup>`. Don't worry, it's quite easy.
About music acquisition
-----------------------
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 33ac3bb7..1544dfbf 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -26,6 +26,11 @@ Available installation methods
Frontend setup
---------------
+.. note::
+
+ You do not need to do this if you are deploying using Docker, as frontend files
+ are already included in the funkwhale docker image.
+
Files for the web frontend are purely static and can simply be downloaded, unzipped and served from any webserver:
.. code-block:: bash
--
GitLab