From: marcelveldt <marcelvanderveldt@MacBook-Silvia.local>
Date: Sun, 13 Oct 2019 16:35:17 +0000 (+0200)
Subject: update docker files
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=11f2299b09665446842cf2f624c330bd0ffdba7c;p=music-assistant-server.git

update docker files

python 3.7.5+ required
---

diff --git a/Dockerfile b/Dockerfile
index 5a0d990a..924172dd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:latest
+FROM python:3.8.0rc1-alpine3.10
 
 # install deps
-RUN apk add flac sox zip curl wget ffmpeg
-RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing python3 py3-numpy py3-scipy py3-matplotlib py3-aiohttp py3-cairocffi
+RUN apk add flac sox zip curl wget ffmpeg taglib
+# RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing py3-numpy py3-scipy py3-matplotlib py3-aiohttp py3-cairocffi
 COPY requirements.txt requirements.txt
-RUN apk --no-cache add --virtual .builddeps build-base python3-dev taglib-dev && \
-    pip3 install -r requirements.txt && \
+RUN apk --no-cache add --virtual .builddeps build-base taglib-dev && \
+    python3 -m pip install -r requirements.txt && \
     apk del .builddeps && \
     rm -rf /root/.cache
 
diff --git a/run.sh b/run.sh
index 2ecf6dd7..2248eb3b 100755
--- a/run.sh
+++ b/run.sh
@@ -7,6 +7,8 @@ if [ "$autoupdate" == "true" ]; then
     cd /tmp
     curl -LOks "https://github.com/marcelveldt/musicassistant/archive/master.zip"
     unzip -q master.zip
+    rm -R /usr/src/app/
+    mkdir /usr/src/app/
     cp -rf musicassistant-master/. /usr/src/app/
     rm -R /tmp/musicassistant-master
 fi