Merge conflicts

docker-compose.yml

@@ -71,11 +71,17 @@ nginx:
 icecast:
     build: ./radio/
     volumes:
-        - logs:/var/log/icecast2
-        - /etc/localtime:/etc/localtime:ro
+        - ./logs:/var/log/icecast2
+        - /etc/localtime:/etc/localtime:ro 
     environment:
         - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk
         - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0
         - ICECAST_RELAY_PASSWORD=9PmUbI1mLne9o
     ports:
         - 8000:8000
+radio:
+    build: dss.radio/
+    ports:
+        - "8888:8888"
+    environment:
+        - ICE_PASSWORD={$ICE_PASSWORD}