From 27824d59c8740f453ca5720f744ccf312fb6fdd4 Mon Sep 17 00:00:00 2001 From: Wouter Habets Date: Mon, 29 Aug 2016 19:02:15 +0200 Subject: [PATCH] Single image --- base/Dockerfile => Dockerfile | 6 ++++++ base/accounts.conf => accounts.conf | 0 base/entrypoint.sh => entrypoint.sh | 0 base/mopidy.conf => mopidy.conf | 0 web/Dockerfile | 9 --------- 5 files changed, 6 insertions(+), 9 deletions(-) rename base/Dockerfile => Dockerfile (89%) rename base/accounts.conf => accounts.conf (100%) rename base/entrypoint.sh => entrypoint.sh (100%) rename base/mopidy.conf => mopidy.conf (100%) delete mode 100644 web/Dockerfile diff --git a/base/Dockerfile b/Dockerfile similarity index 89% rename from base/Dockerfile rename to Dockerfile index bf25201..1f21a3e 100644 --- a/base/Dockerfile +++ b/Dockerfile @@ -29,6 +29,12 @@ RUN pip install -U six \ && pip install Mopidy-Local-SQLite \ && pip install --upgrade pafy +RUN pip install Mopidy-Mopify \ + && pip install Mopidy-Spotmop \ + && pip install Mopidy-MusicBox-Webclient \ + && pip install Mopidy-API-Explorer + + ADD mopidy.conf /var/lib/mopidy/.config/mopidy/mopidy.conf ADD entrypoint.sh /entrypoint.sh diff --git a/base/accounts.conf b/accounts.conf similarity index 100% rename from base/accounts.conf rename to accounts.conf diff --git a/base/entrypoint.sh b/entrypoint.sh similarity index 100% rename from base/entrypoint.sh rename to entrypoint.sh diff --git a/base/mopidy.conf b/mopidy.conf similarity index 100% rename from base/mopidy.conf rename to mopidy.conf diff --git a/web/Dockerfile b/web/Dockerfile deleted file mode 100644 index ee03e7e..0000000 --- a/web/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM whhoesj/mopidy:latest -MAINTAINER Wouter Habets (wouterhabets@gmail.com) - -USER root -RUN pip install Mopidy-Mopify \ - && pip install Mopidy-Spotmop \ - && pip install Mopidy-MusicBox-Webclient \ - && pip install Mopidy-API-Explorer -USER mopidy