diff --git a/bootstrap.docker-compose.macvlan.yml b/bootstrap.docker-compose.macvlan.yml index cfe8e3e..f281473 100644 --- a/bootstrap.docker-compose.macvlan.yml +++ b/bootstrap.docker-compose.macvlan.yml @@ -17,3 +17,5 @@ networks: ip_range: ${NASCOMPOSE_MACVLAN_RANGE?} aux_addresses: nas: ${NASCOMPOSE_MACVLAN_HOST_IP?} + labels: + nas-compose.boostrap: true diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index e3fce39..b47ffda 100644 --- a/bootstrap.docker-compose.yml +++ b/bootstrap.docker-compose.yml @@ -33,10 +33,6 @@ services: nas-compose.boostrap: true networks: - macvlan: - name: macvlan - labels: - nas-compose.boostrap: true docker: name: docker labels: diff --git a/media.docker-compose.local.yml b/media.docker-compose.local.yml new file mode 100644 index 0000000..a90bd8f --- /dev/null +++ b/media.docker-compose.local.yml @@ -0,0 +1,4 @@ +services: + portainer: + ports: + - 32400:32400 diff --git a/media.docker-compose.macvlan.yml b/media.docker-compose.macvlan.yml index e3c1a34..df0497f 100644 --- a/media.docker-compose.macvlan.yml +++ b/media.docker-compose.macvlan.yml @@ -1,6 +1,9 @@ services: plex: - ports: [] networks: macvlan: - ipv4_address: ${NASCOMPOSE_MACVLAN_PLEX_IP} + ipv4_address: ${NASCOMPOSE_MACVLAN_PLEX_IP?} + +networks: + macvlan: + external: true diff --git a/media.docker-compose.yml b/media.docker-compose.yml index 9664a36..b9619f7 100644 --- a/media.docker-compose.yml +++ b/media.docker-compose.yml @@ -6,10 +6,7 @@ services: environment: PLEX_UID: ${NASCOMPOSE_UID?} PLEX_GID: ${NASCOMPOSE_GID?} - ports: - - 32400:32400 networks: - - macvlan - default - traefik volumes: @@ -48,8 +45,6 @@ services: # Komga/Kavita networks: - macvlan: - external: true traefik: external: true