diff --git a/ices/Dockerfile b/ices/Dockerfile index 4dcf98d..b53b94e 100644 --- a/ices/Dockerfile +++ b/ices/Dockerfile @@ -2,8 +2,8 @@ # Dockerfile for ices # -FROM alpine -MAINTAINER kev +FROM alpine:3 +MAINTAINER EasyPi Software Foundation RUN apk add --no-cache ices COPY data /etc/ices diff --git a/ices/README.md b/ices/README.md index 3b67f3e..7921f69 100644 --- a/ices/README.md +++ b/ices/README.md @@ -19,21 +19,25 @@ docker-compose.yml ------------------ ```yaml -ices: - image: easypi/ices-arm - volumes: - - ./data:/etc/ices - devices: - - /dev/snd - links: - - icecast - restart: always +version: "3.8" -icecast: - image: easypi/icecast-arm - ports: - - "8000:8000" - restart: always +services: + + ices: + image: vimagick/ices + volumes: + - ./data:/etc/ices + devices: + - /dev/snd + depends_on: + - icecast + restart: unless-stopped + + icecast: + image: vimagick/icecast + ports: + - "8000:8000" + restart: unless-stopped ``` ices.xml diff --git a/ices/arm/Dockerfile b/ices/arm/Dockerfile deleted file mode 100644 index 05adca7..0000000 --- a/ices/arm/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -# -# Dockerfile for ices-arm -# - -FROM easypi/alpine-arm -MAINTAINER EasyPi Software Foundation - -RUN apk add --no-cache ices -COPY data /etc/ices - -CMD ["ices", "/etc/ices/ices.xml"] diff --git a/ices/arm/data/ices.txt b/ices/arm/data/ices.txt deleted file mode 100644 index 436dc05..0000000 --- a/ices/arm/data/ices.txt +++ /dev/null @@ -1,2 +0,0 @@ -artist=Various Artists -title=Untitled Song diff --git a/ices/arm/data/ices.xml b/ices/arm/data/ices.xml deleted file mode 100644 index 298a855..0000000 --- a/ices/arm/data/ices.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 0 - 4 - 1 - /var/run/ices.pid - - - Example stream name - Example genre - A short description of your stream - https://easypi.duckdns.org - - - alsa - 44100 - 1 - plughw:1,0 - 1 - /etc/ices/ices.txt - - - icecast - 8000 - hackme - /live.ogg - - 0 - 44100 - 1 - - - - diff --git a/ices/arm/docker-compose.yml b/ices/arm/docker-compose.yml deleted file mode 100644 index d9fdc8b..0000000 --- a/ices/arm/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -ices: - image: easypi/ices-arm - volumes: - - ./data:/etc/ices - devices: - - /dev/snd - links: - - icecast - restart: always - -icecast: - image: easypi/icecast-arm - ports: - - "8000:8000" - restart: always diff --git a/ices/docker-compose.yml b/ices/docker-compose.yml index 9d200d7..7a32f51 100644 --- a/ices/docker-compose.yml +++ b/ices/docker-compose.yml @@ -1,15 +1,19 @@ -ices: - image: vimagick/ices - volumes: - - ./data:/etc/ices - devices: - - /dev/snd - links: - - icecast - restart: always +version: "3.8" -icecast: - image: vimagick/icecast - ports: - - "8000:8000" - restart: always +services: + + ices: + image: vimagick/ices + volumes: + - ./data:/etc/ices + devices: + - /dev/snd + depends_on: + - icecast + restart: unless-stopped + + icecast: + image: vimagick/icecast + ports: + - "8000:8000" + restart: unless-stopped