Merge conflicts

This commit is contained in:
Fergal Moran
2015-10-05 19:15:49 +00:00

View File

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