Support for linux-amd64, linux-arm and linux-arm64 added

.travis.yml

@@ -0,0 +1,55 @@
+sudo: required
+
+language: bash
+
+services:
+  - docker
+
+before_install:
+  # Update docker for multi-stage build
+  - sudo service docker stop
+  - curl -fsSL https://get.docker.com/ | sudo sh
+
+  # Prepare qemu
+  - docker run --rm --privileged multiarch/qemu-user-static:register --reset
+  # Get qemu-arm-static binary
+  - mkdir tmp
+  - >
+    pushd tmp &&
+    curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.9.1-1/qemu-arm-static.tar.gz &&
+    tar xzf qemu-arm-static.tar.gz &&
+    curl -L -o qemu-aarch64-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.9.1-1/qemu-aarch64-static.tar.gz &&
+    tar xzf qemu-aarch64-static.tar.gz &&
+    popd
+
+script:
+  # Build all images
+  - docker build --build-arg PLATFORM=linux-amd64 -t larsks/logitech-media-server:linux-amd64 -f Dockerfile.linux-amd64 .
+  - docker build --build-arg PLATFORM=linux-arm -t larsks/logitech-media-server:linux-arm -f Dockerfile.linux-arm32v7 .
+  - docker build --build-arg PLATFORM=linux-arm64 -t larsks/logitech-media-server:linux-arm64 -f Dockerfile.linux-arm64v8 .
+
+after_success:
+  - > 
+    if [ -n "$TRAVIS_TAG" ]; then
+      # Docker login
+      echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+
+      # Docker Tag
+      docker tag larsks/logitech-media-server:linux-amd64 larsks/logitech-media-server:${TRAVIS_TAG}-linux-amd64
+      docker tag larsks/logitech-media-server:linux-arm larsks/logitech-media-server:${TRAVIS_TAG}-linux-arm
+      docker tag larsks/logitech-media-server:linux-arm64 larsks/logitech-media-server:${TRAVIS_TAG}-linux-arm64
+
+      # Docker Push
+      docker push larsks/logitech-media-server:${TRAVIS_TAG}-linux-amd64
+      docker push larsks/logitech-media-server:${TRAVIS_TAG}-linux-arm
+      docker push larsks/logitech-media-server:${TRAVIS_TAG}-linux-arm64
+
+      # Download manifest-tool
+      wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
+      mv manifest-tool-linux-amd64 manifest-tool
+      chmod +x manifest-tool
+
+      # Create and push manifest-list
+      ./manifest-tool push from-args --platforms linux/amd64,linux/arm,linux/arm64 --template "larsks/logitech-media-server:${TRAVIS_TAG}-OS-ARCH" --target "larsks/logitech-media-server:$TRAVIS_TAG"
+      ./manifest-tool push from-args --platforms linux/amd64,linux/arm,linux/arm64 --template "larsks/logitech-media-server:${TRAVIS_TAG}-OS-ARCH" --target "larsks/logitech-media-server:latest"
+    fi

Dockerfile.linux-amd64

@@ -0,0 +1,35 @@
+FROM amd64/debian:stretch-slim
+LABEL maintainer="Lars Kellogg-Stedman <[email protected]>"
+LABEL maintainer="Raymond M Mouthaan <[email protected]>"
+
+ENV SQUEEZE_VOL /srv/squeezebox
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV PACKAGE_URL=http://downloads-origin.slimdevices.com/nightly/?ver=7.9
+ENV PACKAGE_VERSION=7.9.2~1524841547
+ENV ARCH=amd64
+
+# Install requirements and utilities
+RUN apt-get update && \
+    apt-get -y install curl wget nano faad flac lame sox libio-socket-ssl-perl \
+    iputils-ping \
+    iproute2 \
+    && apt-get clean
+
+# Download and install nightly
+RUN wget -r --no-directories --no-parent -A 'logitechmediaserver_'${PACKAGE_VERSION}'_'${ARCH}'.deb' ${PACKAGE_URL} && \
+    mv logitechmediaserver_${PACKAGE_VERSION}_${ARCH}.deb /tmp/logitechmediaserver.deb && \
+    dpkg -i /tmp/logitechmediaserver.deb && \
+    rm -f /tmp/logitechmediaserver.deb && \
+    apt-get clean
+
+# This will be created by the entrypoint script.
+RUN userdel squeezeboxserver
+
+VOLUME $SQUEEZE_VOL
+EXPOSE 3483 3483/udp 9000 9090
+
+COPY entrypoint.sh /entrypoint.sh
+COPY start-squeezebox.sh /start-squeezebox.sh
+RUN chmod 755 /entrypoint.sh /start-squeezebox.sh
+ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.linux-arm32v7

@@ -0,0 +1,37 @@
+FROM arm32v7/debian:stretch-slim
+COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
+
+LABEL maintainer="Lars Kellogg-Stedman <[email protected]>"
+LABEL maintainer="Raymond M Mouthaan <[email protected]>"
+
+ENV SQUEEZE_VOL /srv/squeezebox
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV PACKAGE_URL=http://downloads-origin.slimdevices.com/nightly/?ver=7.9
+ENV PACKAGE_VERSION=7.9.2~1524841547
+ENV ARCH=arm
+
+# Install requirements and utilities
+RUN apt-get update && \
+    apt-get -y install curl wget nano faad flac lame sox libio-socket-ssl-perl \
+    iputils-ping \
+    iproute2 \
+    && apt-get clean
+
+# Download and install nightly
+RUN wget -r --no-directories --no-parent -A 'logitechmediaserver_'${PACKAGE_VERSION}'_'${ARCH}'.deb' ${PACKAGE_URL} && \
+    mv logitechmediaserver_${PACKAGE_VERSION}_${ARCH}.deb /tmp/logitechmediaserver.deb && \
+    dpkg -i /tmp/logitechmediaserver.deb && \
+    rm -f /tmp/logitechmediaserver.deb && \
+    apt-get clean
+
+# This will be created by the entrypoint script.
+RUN userdel squeezeboxserver
+
+VOLUME $SQUEEZE_VOL
+EXPOSE 3483 3483/udp 9000 9090
+
+COPY entrypoint.sh /entrypoint.sh
+COPY start-squeezebox.sh /start-squeezebox.sh
+RUN chmod 755 /entrypoint.sh /start-squeezebox.sh
+ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.linux-arm64v8

@@ -0,0 +1,37 @@
+FROM arm64v8/debian:stretch-slim
+COPY tmp/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+
+LABEL maintainer="Lars Kellogg-Stedman <[email protected]>"
+LABEL maintainer="Raymond M Mouthaan <[email protected]>"
+
+ENV SQUEEZE_VOL /srv/squeezebox
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV PACKAGE_URL=http://downloads-origin.slimdevices.com/nightly/?ver=7.9
+ENV PACKAGE_VERSION=7.9.2~1524841547
+ENV ARCH=arm
+
+# Install requirements and utilities
+RUN apt-get update && \
+    apt-get -y install curl wget nano faad flac lame sox libio-socket-ssl-perl \
+    iputils-ping \
+    iproute2 \
+    && apt-get clean
+
+# Download and install nightly
+RUN wget -r --no-directories --no-parent -A 'logitechmediaserver_'${PACKAGE_VERSION}'_'${ARCH}'.deb' ${PACKAGE_URL} && \
+    mv logitechmediaserver_${PACKAGE_VERSION}_${ARCH}.deb /tmp/logitechmediaserver.deb && \
+    dpkg -i /tmp/logitechmediaserver.deb && \
+    rm -f /tmp/logitechmediaserver.deb && \
+    apt-get clean
+
+# This will be created by the entrypoint script.
+RUN userdel squeezeboxserver
+
+VOLUME $SQUEEZE_VOL
+EXPOSE 3483 3483/udp 9000 9090
+
+COPY entrypoint.sh /entrypoint.sh
+COPY start-squeezebox.sh /start-squeezebox.sh
+RUN chmod 755 /entrypoint.sh /start-squeezebox.sh
+ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -5,12 +5,12 @@ This is a Docker image for running the Logitech Media Server package
 
 Run Directly:
 
-    docker run -d --init \
-               -p 9000:9000 \
+    docker run -p 9000:9000 \
                -p 9090:9090 \
                -p 3483:3483 \
                -p 3483:3483/udp \
                -v /etc/localtime:/etc/localtime:ro \
+               -v /etc/timezone:/etc/timezone:ro \
                -v <local-state-dir>:/srv/squeezebox \
                -v <audio-dir>:/srv/music \
                larsks/logitech-media-server
@@ -24,7 +24,7 @@ on that port.
 
 ## Using docker-compose
 
-There is a [docker-compose.yaml][] included in this repository that
+There is a [docker-compose-logitech-media-server.yml][] included in this repository that
 you will let you bring up a Logitech Media Server container using
 `docker-compose`.  The compose file includes the following:
 
@@ -37,4 +37,4 @@ for example:
 
     AUDIO_DIR=/home/USERNAME/Music
 
-[docker-compose.yaml]: docker-compose.yaml
+[docker-compose-logitech-media-server.yml]: docker-compose-logitech-media-server.yml

docker-compose-logitech-media-server.yml

@@ -0,0 +1,25 @@
+################################################################################
+# Logitech-Media-Server aka Slimserver
+################################################################################
+#$ docker stack deploy logitech-media-server --compose-file docker-compose-logitech-media-server.yml
+################################################################################
+version: "3.6"
+
+services:
+  logitech-media-server:
+    image: larsks/logitech-media-server
+    ports:
+      - "9000:9000"
+      - "9090:9090"
+      - "3483:3483"
+      - "3483:3483/udp"
+    volumes:
+      - <SQUEEZEBOX_PERSISTENT_DIR>:/srv/squeezebox
+      - ${AUDIO_DIR}:/srv/music
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure