From 5e42d25cebbef6f883297fe85d5dd3c8d103272b Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 9 Feb 2020 20:12:43 +0800 Subject: [PATCH] update --- icecast/arm/Dockerfile | 2 +- icecast/arm/docker-compose.yml | 2 +- icecast/docker-compose.yml | 2 +- mpd/arm/Dockerfile | 2 +- mpd/arm/docker-compose.yml | 42 +++++++++++++++++++--------------- mpd/docker-compose.yml | 42 +++++++++++++++++++--------------- 6 files changed, 50 insertions(+), 42 deletions(-) diff --git a/icecast/arm/Dockerfile b/icecast/arm/Dockerfile index d1442c0..419b668 100644 --- a/icecast/arm/Dockerfile +++ b/icecast/arm/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for icecast-arm # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation diff --git a/icecast/arm/docker-compose.yml b/icecast/arm/docker-compose.yml index 3bd16f9..41badde 100644 --- a/icecast/arm/docker-compose.yml +++ b/icecast/arm/docker-compose.yml @@ -2,4 +2,4 @@ icecast: image: easypi/icecast-arm ports: - "8000:8000" - restart: always + restart: unless-stopped diff --git a/icecast/docker-compose.yml b/icecast/docker-compose.yml index 87dd0a4..e0ad8f4 100644 --- a/icecast/docker-compose.yml +++ b/icecast/docker-compose.yml @@ -2,4 +2,4 @@ icecast: image: vimagick/icecast ports: - "8000:8000" - restart: always + restart: unless-stopped diff --git a/mpd/arm/Dockerfile b/mpd/arm/Dockerfile index ea8ea31..f545d38 100644 --- a/mpd/arm/Dockerfile +++ b/mpd/arm/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for mpd-arm # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation RUN apk add --no-cache mpd mpc diff --git a/mpd/arm/docker-compose.yml b/mpd/arm/docker-compose.yml index 730ef06..e78e00a 100644 --- a/mpd/arm/docker-compose.yml +++ b/mpd/arm/docker-compose.yml @@ -1,20 +1,24 @@ -mpd: - image: easypi/mpd-arm - ports: - - "6600:6600" - - "8800:8800" - volumes: - - ./mpd.conf:/etc/mpd.conf - - ./music:/var/lib/mpd/music - - ./playlists:/var/lib/mpd/playlists - devices: - - /dev/snd - links: - - icecast - restart: always +version: "3.7" -icecast: - image: easypi/icecast-arm - ports: - - "8000:8000" - restart: always +services: + + mpd: + image: easypi/mpd-arm + ports: + - "6600:6600" + - "8800:8800" + volumes: + - ./mpd.conf:/etc/mpd.conf + - ./music:/var/lib/mpd/music + - ./playlists:/var/lib/mpd/playlists + devices: + - /dev/snd + depends_on: + - icecast + restart: unless-stopped + + icecast: + image: easypi/icecast-arm + ports: + - "8000:8000" + restart: unless-stopped diff --git a/mpd/docker-compose.yml b/mpd/docker-compose.yml index 0979bad..9092a7c 100644 --- a/mpd/docker-compose.yml +++ b/mpd/docker-compose.yml @@ -1,20 +1,24 @@ -mpd: - image: vimagick/mpd - ports: - - "6600:6600" - - "8800:8800" - volumes: - - ./mpd.conf:/etc/mpd.conf - - ./music:/var/lib/mpd/music - - ./playlists:/var/lib/mpd/playlists - devices: - - /dev/snd - links: - - icecast - restart: always +version: "3.7" -icecast: - image: vimagick/icecast - ports: - - "8000:8000" - restart: always +services: + + mpd: + image: vimagick/mpd + ports: + - "6600:6600" + - "8800:8800" + volumes: + - ./mpd.conf:/etc/mpd.conf + - ./music:/var/lib/mpd/music + - ./playlists:/var/lib/mpd/playlists + devices: + - /dev/snd + depends_on: + - icecast + restart: unless-stopped + + icecast: + image: vimagick/icecast + ports: + - "8000:8000" + restart: unless-stopped