secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Restructuring docker (again)

Browse Source 
- Nested structure to match /var/lib/mopidy
- Updating gitignore to exclude individual configs
This commit is contained in:
James Barnsley
2022-11-12 08:58:33 +13:00
parent 154e72234e
commit 60c4a4e389
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -14,12 +14,13 @@ npm-debug.log
.idea .idea
._* ._*
venv venv
docker/snapserver.conf docker/snapserver/snapserver.conf
docker/mopidy.conf docker/snapserver/snapserver.json
docker/data/ docker/snapserver/meta_mopidy.py
docker/mopidy/mopidy.conf
docker/mopidy/iris/
docker/mopidy/icecast2.xml
docker/jellyfin/ docker/jellyfin/
docker/icecast2.xml
docker/meta_mopidy.py
docker-compose.yml docker-compose.yml
/.tox/ /.tox/
/__tests__/__pycache__/ /__tests__/__pycache__/

11
docker-compose.example.yml
View File

@ -8,9 +8,9 @@ services:
- 1780:1780 - 1780:1780
volumes: volumes:
- /tmp/snapserver:/tmp - /tmp/snapserver:/tmp
- ./docker/snapserver.conf:/etc/snapserver.conf # Copy from snapserver-example.conf - ./docker/snapserver/snapserver.conf:/etc/snapserver.conf
- ./docker/snapserver.json:/root/.config/snapserver/server.json - ./docker/snapserver/snapserver.json:/root/.config/snapserver/server.json
- ./docker/meta_mopidy.py:/usr/share/snapserver/plug-ins/meta_mopidy.py - ./docker/snapserver/meta_mopidy.py:/usr/share/snapserver/plug-ins/meta_mopidy.py
mopidy: mopidy:
image: jaedb/iris image: jaedb/iris
environment: environment:
@ -23,7 +23,8 @@ services:
- 6600:6600 - 6600:6600
- 6680:6680 - 6680:6680
volumes: volumes:
- ./docker/data:/var/lib/mopidy/iris - ./docker/mopidy/iris:/var/lib/mopidy/iris # Iris-specific storage
- ./docker/mopidy.conf:/config/mopidy.conf - ./docker/mopidy/m3u:/var/lib/mopidy/m3u # To persist local playlists
- ./docker/mopidy/mopidy.conf:/config/mopidy.conf
- /mnt/Music:/var/lib/mopidy/media - /mnt/Music:/var/lib/mopidy/media
- /tmp/snapserver:/tmp - /tmp/snapserver:/tmp

0
docker/icecast2.example.xml → docker/mopidy/icecast2.example.xml
View File

0
docker/mopidy.example.conf → docker/mopidy/mopidy.example.conf
View File

0
docker/pulse-client.conf → docker/mopidy/pulse-client.conf
View File

2
docker/snapserver-example.conf → docker/snapserver/snapserver-example.conf
View File

@ -73,7 +73,7 @@ doc_root = /usr/share/snapserver/snapweb/
# stream URI of the PCM input stream, can be configured multiple times # stream URI of the PCM input stream, can be configured multiple times
# Format: TYPE://host/path?name=NAME[&codec=CODEC][&sampleformat=SAMPLEFORMAT] # Format: TYPE://host/path?name=NAME[&codec=CODEC][&sampleformat=SAMPLEFORMAT]
#stream = pipe:///tmp/snapfifo?name=default #stream = pipe:///tmp/snapfifo?name=default
stream = pipe:///tmp/snapfifo?name=Default&sampleformat=48000:16:2&controlscript=meta_mpd.py stream = pipe:///tmp/snapfifo?name=Default&sampleformat=48000:16:2&controlscript=meta_mopidy.py
# Default sample format # Default sample format
#sampleformat = 48000:16:2 #sampleformat = 48000:16:2