Update Dockerfile
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 31 Oct 2020 23:41:40 +0000 (00:41 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 31 Oct 2020 23:41:40 +0000 (00:41 +0100)
Dockerfile

index 448a59f4f8cdadd3bdb8783e5bfadb4d03f3541a..a879c06b711b9c031a3369a95f8b53a3d65a1fcd 100755 (executable)
@@ -1,15 +1,18 @@
 FROM python:slim
 
 # Build arguments
+# ARG BUILD_ARCH="amd64"
 ARG MASS_VERSION=0.0.60
 ARG JEMALLOC_VERSION=5.2.1
 ARG S6_OVERLAY_VERSION=2.1.0.2
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+
+RUN BUILD_ARCH="$(dpkg --print-architecture)" && \
+    apt-get update && apt-get install -y --no-install-recommends \
                # required packages
-               wget bash jq flac sox libsox-fmt-mp3 zip curl unzip ffmpeg libsndfile1 libtag1v5 libblas3 liblapack3 \
+               git bash jq flac sox libsox-fmt-mp3 zip curl unzip ffmpeg libsndfile1 libtag1v5 libblas3 liblapack3 \
                # build packages
-               libtag1-dev build-essential git liblapack-dev libblas-dev gfortran libatlas-base-dev && \
+               wget libtag1-dev build-essential liblapack-dev libblas-dev gfortran libatlas-base-dev && \
     # Setup jemalloc
     curl -L -s https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 | tar -xjf - -C /usr/src && \
     cd /usr/src/jemalloc-${JEMALLOC_VERSION} && \
@@ -21,6 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${BUILD_ARCH}.tar.gz" | tar zxvf - -C / && \
     mkdir -p /etc/fix-attrs.d && \
     mkdir -p /etc/services.d && \
+    cd /tmp && \
     # make sure uvloop is installed
     pip install --upgrade uvloop && \
     # install music assistant