docker-compose.yml etc. - proxy jellyfin on virtual host
nominally working, although some hard-wired values to remove
This commit is contained in:
@@ -19,7 +19,19 @@ volumes:
|
|||||||
mopidy_data:
|
mopidy_data:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
# This is for proxied containers
|
||||||
proxy-tier:
|
proxy-tier:
|
||||||
|
# This is for containers which need to be host mode
|
||||||
|
lan:
|
||||||
|
name: lan
|
||||||
|
driver: macvlan
|
||||||
|
driver_opts:
|
||||||
|
parent: enp3s0 # our ethernet interface
|
||||||
|
ipam:
|
||||||
|
config:
|
||||||
|
- gateway: 192.168.0.1
|
||||||
|
subnet: 192.168.0.0/24
|
||||||
|
ip_range: 192.168.0.240/29 # addresses 240-248 (6 usable)
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
@@ -125,8 +137,10 @@ services:
|
|||||||
- jellyfin_cache:/cache
|
- jellyfin_cache:/cache
|
||||||
- minidlna_data:/media
|
- minidlna_data:/media
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
proxy-tier:
|
||||||
- default
|
default:
|
||||||
|
lan: # Static ip for the container on the macvlan net
|
||||||
|
ipv4_address: 192.168.0.241
|
||||||
env_file:
|
env_file:
|
||||||
- jellyfin.env
|
- jellyfin.env
|
||||||
|
|
||||||
@@ -136,7 +150,10 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- minidlna_state:/minidlna
|
- minidlna_state:/minidlna
|
||||||
- minidlna_data:/media:ro
|
- minidlna_data:/media:ro
|
||||||
network_mode: host
|
networks:
|
||||||
|
default:
|
||||||
|
lan: # Static ip for the container on the macvlan net
|
||||||
|
ipv4_address: 192.168.0.242
|
||||||
environment:
|
environment:
|
||||||
- UPID=2000
|
- UPID=2000
|
||||||
- UGID=2000
|
- UGID=2000
|
||||||
@@ -158,6 +175,8 @@ services:
|
|||||||
- mopidy_data:/data
|
- mopidy_data:/data
|
||||||
# Add local music folder
|
# Add local music folder
|
||||||
- minidlna_data:/music:ro
|
- minidlna_data:/music:ro
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
devices:
|
devices:
|
||||||
- /dev/snd
|
- /dev/snd
|
||||||
restart: always
|
restart: always
|
||||||
@@ -166,8 +185,10 @@ services:
|
|||||||
build: ./upmpdcli
|
build: ./upmpdcli
|
||||||
depends_on:
|
depends_on:
|
||||||
- mopidy
|
- mopidy
|
||||||
# Host mode needed for advertisement
|
networks:
|
||||||
network_mode: host
|
default:
|
||||||
|
lan: # Static ip for the container on the macvlan net
|
||||||
|
ipv4_address: 192.168.0.243
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
# Next three services adapted from
|
# Next three services adapted from
|
||||||
|
|||||||
Submodule templates/docker-compose/mopidy updated: 3aa890f6a9...b389297213
@@ -1,8 +1,9 @@
|
|||||||
FROM alpine:3.13
|
FROM alpine:3.15
|
||||||
|
|
||||||
RUN apk update \
|
RUN apk update \
|
||||||
&& apk upgrade \
|
&& apk upgrade \
|
||||||
&& apk add --no-cache \
|
&& apk add --no-cache \
|
||||||
|
--repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
||||||
--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
--repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||||
python3 \
|
python3 \
|
||||||
openssl \
|
openssl \
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#upnpiface =
|
#upnpiface =
|
||||||
#upnpip =
|
#upnpip =
|
||||||
# upnpport =
|
# upnpport =
|
||||||
|
upnpip = 192.168.0.243
|
||||||
|
|
||||||
# media renderer parameters
|
# media renderer parameters
|
||||||
friendlyname = Snackpot
|
friendlyname = Snackpot
|
||||||
@@ -25,4 +26,4 @@ checkcontentformat = 0
|
|||||||
#mpdport = 6600
|
#mpdport = 6600
|
||||||
#mpdpassword =
|
#mpdpassword =
|
||||||
#ownqueue = 1
|
#ownqueue = 1
|
||||||
|
mpdhost = mopidy
|
||||||
|
|||||||
Reference in New Issue
Block a user