preparing to deploy

Dockerfile.icecast

@@ -0,0 +1,16 @@
+FROM alpine:latest
+
+ARG UID
+ARG GID
+
+RUN addgroup -g ${GID} -S icecast && \ 
+    adduser --uid ${UID} -S icecast icecast
+
+RUN apk add --update \
+        icecast \
+        mailcap && \
+    rm -rf /var/cache/apk/*
+
+EXPOSE 8000
+VOLUME ["/var/log/icecast"]
+CMD icecast -c /etc/icecast.xml

Dockerfile.music.mpd

@@ -1,18 +1,22 @@
 FROM alpine:latest
 
+ARG UID
+ARG GID
+
+RUN addgroup -g ${GID} -S mpd && adduser --uid ${UID} -S -G mpd mpd
+
 RUN apk update && \
     apk add mpd 
-RUN apk add lsof bash
 
-# COPY mpd.music.conf /etc/mpd.conf
-COPY ./jingles/nightingale_singing.mp3 /usr/share/icecast/web/
-
-RUN addgroup mpd
 RUN mkdir -p /music
-RUN mkdir -p /mpd
+RUN mkdir -p /mpd/db
+RUN mkdir -p /mpd/playlists
+
+RUN chown -R mpd:mpd /mpd
+RUN chown -R mpd:mpd /music
 
 VOLUME /music
 VOLUME /mpd
 
-# CMD ["lsof", "-i", ":6600"]
+USER mpd
 CMD ["mpd", "--stderr", "--no-daemon", "/etc/mpd.conf"]

Dockerfile.py.bot

@@ -1,5 +1,10 @@
 FROM python:3.9-alpine
 
+ARG UID
+ARG GID
+
+RUN addgroup -g ${GID} -S bot && adduser --uid ${UID} -S -G bot bot
+
 WORKDIR /app
 
 COPY requirements.txt .

Dockerfile.voice.mpd

@@ -1,12 +1,11 @@
 FROM alpine:latest
 
+ARG UID
+ARG GID
+RUN addgroup -g ${GID} -S mpd && adduser --uid ${UID} -S -G mpd mpd
+
 RUN apk update && \
     apk add mpd 
-RUN apk add lsof bash
-
-RUN addgroup mpd
-RUN mkdir -p /voice
-RUN mkdir -p /mpd
 
 VOLUME /music
 VOLUME /mpd

bot.env

@@ -0,0 +1,2 @@
+TELEGRAM_BOT_TOKEN="!!! Get token from @BotFather and put it here !!!"
+

docker-compose.yml

@@ -1,46 +1,50 @@
-version: '3.8'
+version: '3.8'                   
 services:
   icecast:
-    user: icecast
-    image: infiniteproject/icecast
+    user: "${UID}:${GID}"
+    build:
+      context: .
+      dockerfile: Dockerfile.voice.mpd
+    image: irirangi-icecast-image
     ports:
       - "8000:8000"
     volumes:
       - ./icecast.xml:/etc/icecast.xml
       - ./music:/music
       - ./jingles:/usr/share/icecast/web/jingles
-      - ./logs/icecast:/var/log/icecast
   mpd-voice:
-    user: mpd
+    user: "${UID}:${GID}"
     build:
       context: .
       dockerfile: Dockerfile.voice.mpd
-    image: irirangi-mpd-voice-image:latest
+    image: irirangi-mpd-voice-image
     volumes:
       - ./mpd.voice.conf:/etc/mpd.conf
       - ./voice:/voice
       - ./mpd:/mpd
 
   mpd:
-    user: mpd
+    user: "${UID}:${GID}"
     build:
       context: .
       dockerfile: Dockerfile.music.mpd
-    image: irirangi-mpd-image:latest
+    image: irirangi-mpd-image
     volumes:
       - ./mpd/run/:/run/mpd/
       - ./mpd.music.conf:/etc/mpd.conf
       - ./music:/music
       - ./mpd:/mpd
 
   bot:
+    user: "${UID}:${GID}"
     build:
       context: .
       dockerfile: Dockerfile.py.bot
-    image: irirangi-telegram-bot:latest
+    image: irirangi-telegram-bot
+    env_file:
+      - bot.env
     volumes:
       - ./music:/music
       - ./voice:/voice
       - ./app:/app
-    command: /bin/sh -c "sleep 2 && python /app/bot.py"
     restart: unless-stopped

mpd.voice.conf

@@ -37,7 +37,7 @@ audio_output {
 music_directory "/voice"
 
 # Set the playlist directory
-playlist_directory "/mpd/playlists.voice"
+playlist_directory "/mpd/playlists"
 
 # Set the database directory
 db_file "/mpd/tag_cache.voice"