From 077d69d44be466adf646ef4a21ace6573b1b2039 Mon Sep 17 00:00:00 2001 From: Adam French Date: Mon, 24 Nov 2025 16:29:22 +0000 Subject: [PATCH] rename --- docker-compose.yml | 3 ++- icecast/Dockerfile | 19 ------------------ icecast/entrypoint.sh | 11 ----------- icecast/icecast.xml.template | 37 ------------------------------------ icecast/stream.liq.template | 13 ------------- 5 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 icecast/Dockerfile delete mode 100755 icecast/entrypoint.sh delete mode 100644 icecast/icecast.xml.template delete mode 100644 icecast/stream.liq.template diff --git a/docker-compose.yml b/docker-compose.yml index d970add..2f68de7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: restart: unless-stopped depends_on: - backend + - icecast2 networks: - app-network ports: @@ -66,7 +67,7 @@ services: icecast2: build: - context: ./icecast + context: ./icecast2 dockerfile: Dockerfile container_name: "${ICECAST_HOST}" restart: always diff --git a/icecast/Dockerfile b/icecast/Dockerfile deleted file mode 100644 index 2474b0e..0000000 --- a/icecast/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM debian:latest as builder - -WORKDIR /app - - -RUN apt-get update \ - && apt-get install --yes icecast2 gettext media-types -# RUN apt-get install --yes liquidsoap - -RUN useradd radio -RUN chown -R radio:radio /etc/icecast2 /var/log/icecast2 -# RUN chown -R radio:radio /etc/liquidsoap /var/log/liquidsoap -USER radio - -COPY icecast.xml.template /etc/icecast2/icecast.xml.template -# COPY stream.liq.template /etc/liquidsoap/stream.liq.template -COPY entrypoint.sh /entrypoint.sh - -ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/icecast/entrypoint.sh b/icecast/entrypoint.sh deleted file mode 100755 index 19510bc..0000000 --- a/icecast/entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Substitute environment variables into template -envsubst < /etc/icecast2/icecast.xml.template > /etc/icecast2/icecast.xml -# envsubst < /etc/liquidsoap/stream.liq.template > /etc/liquidsoap/stream.liq - -# Run icecast with the generated config -exec icecast2 -c /etc/icecast2/icecast.xml -# exec liquidsoap /etc/liquidsoap/stream.liq -# wait -n diff --git a/icecast/icecast.xml.template b/icecast/icecast.xml.template deleted file mode 100644 index 6930409..0000000 --- a/icecast/icecast.xml.template +++ /dev/null @@ -1,37 +0,0 @@ - - - ${ICECAST_SOURCE_PASSWORD} - ${ICECAST_RELAY_PASSWORD} - ${ICECAST_ADMIN_USER} - ${ICECAST_ADMIN_PASSWORD} - - - ${ICECAST_HOST} - London, UK - adam.a.french@outlook.com - - - ${ICECAST_PORT} - - - - ${ICECAST_MOUNT} - - - - 100 - 2 - - - - /usr/share/icecast2 - /var/log/icecast2 - /usr/share/icecast2/web - /usr/share/icecast2/admin - - - - - 0 - - diff --git a/icecast/stream.liq.template b/icecast/stream.liq.template deleted file mode 100644 index 91c8d57..0000000 --- a/icecast/stream.liq.template +++ /dev/null @@ -1,13 +0,0 @@ -# Microphone input -mic = input.pulseaudio() - -# Icecast output -output.icecast( - %mp3, - host = "$ICECAST_HOST", - port = "$ICECAST_PORT", - password = "$ICECAST_SOURCE_PASSWORD", - mount = "$ICECAST_MOUNT", - name = "Live DJ stream", - mic -)