From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Sun, 1 Nov 2020 21:44:37 +0000 (+0100)
Subject: Update Dockerfile
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=483d4a71ee50940de66bb02dc482594fcbf5b175;p=music-assistant-server.git

Update Dockerfile
---

diff --git a/Dockerfile b/Dockerfile
index b437d802..f39a670c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,8 @@ ARG S6_OVERLAY_VERSION=2.1.0.2
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
+WORKDIR /usr/src
+
 RUN set -x \
     && apt-get update && apt-get install -y --no-install-recommends \
         # required packages
@@ -28,28 +30,25 @@ RUN set -x \
     # Setup s6 overlay
     && if [ "$TARGETPLATFORM" == "linux/arm/v7" ]; \
       then \
-          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-arm.tar.gz" \
-          | tar zxvf - -C /; \
+          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-arm.tar.gz" | tar zxvf - -C / ;\
     elif [ "$TARGETPLATFORM" == "linux/arm/v6" ]; \
       then \
-          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-armhf.tar.gz" \
-          | tar zxvf - -C /; \
+          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-armhf.tar.gz" | tar zxvf - -C / ;\
     elif [ "$TARGETPLATFORM" == "linux/arm64" ]; \
       then \
-          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-aarch64.tar.gz" \
-          | tar zxvf - -C /; \
+          curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-aarch64.tar.gz" | tar zxvf - -C / ;\
     else \
-        curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz" \
-        | tar zxvf - -C /; \
+        curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz" | tar zxvf - -C / ;\
     fi \
     && mkdir -p /etc/fix-attrs.d \
     && mkdir -p /etc/services.d \
+    && cd /tmp \
     \
     # rustup requirement for maturin/orjson
     && pip install maturin \
     && curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-10-24 --profile minimal -y \
     # install uvloop and music assistant
-    && cd /tmp && pip install --upgrade uvloop music-assistant==${MASS_VERSION} \
+    && pip install --upgrade uvloop music-assistant==${MASS_VERSION} \
     # cleanup build packages
     && apt-get purge -y --auto-remove libtag1-dev build-essential liblapack-dev libblas-dev gfortran libatlas-base-dev \
     && rm -rf /var/lib/apt/lists/*