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

Update Dockerfile
---

diff --git a/Dockerfile b/Dockerfile
index f39a670c..db95aba1 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,6 @@ FROM python:3.8-slim
 # Build arguments
 ARG MASS_VERSION=0.0.60
 ARG JEMALLOC_VERSION=5.2.1
-ARG S6_OVERLAY_VERSION=2.1.0.2
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -27,21 +26,6 @@ RUN set -x \
     && make install \
     && rm -rf /usr/src/jemalloc-${JEMALLOC_VERSION} \
     \
-    # 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 / ;\
-    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 / ;\
-    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 / ;\
-    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 / ;\
-    fi \
-    && mkdir -p /etc/fix-attrs.d \
-    && mkdir -p /etc/services.d \
     && cd /tmp \
     \
     # rustup requirement for maturin/orjson
@@ -53,10 +37,9 @@ RUN set -x \
     && apt-get purge -y --auto-remove libtag1-dev build-essential liblapack-dev libblas-dev gfortran libatlas-base-dev \
     && rm -rf /var/lib/apt/lists/*
 
-# copy rootfs
-COPY rootfs /
 
 ENV DEBUG=false
 VOLUME [ "/data" ]
 
-ENTRYPOINT ["/init"]
\ No newline at end of file
+ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
+ENTRYPOINT ["python", "-m", "music_assistant", "--config", "/data"]
\ No newline at end of file