Merge branch 'github/fork/f1rmb/fix_yaml_formatting' into 'master'
Fix YAML files formatting (currently, install is broken) See merge request hacknix/FreeDMR!15
This commit is contained in:
commit
48611c79f7
@ -112,7 +112,7 @@ networks:
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: 172.16.238.0/24
|
||||
gateway: 172.16.238.1
|
||||
- subnet: fd2a:70b6:9f54:29b6::/64
|
||||
gateway: fd2a:70b6:9f54:29b6::1
|
||||
- subnet: 172.16.238.0/24
|
||||
gateway: 172.16.238.1
|
||||
- subnet: fd2a:70b6:9f54:29b6::/64
|
||||
gateway: fd2a:70b6:9f54:29b6::1
|
||||
|
@ -20,8 +20,8 @@ version: '2.4'
|
||||
services:
|
||||
freedmr:
|
||||
container_name: freedmr
|
||||
cpu_shares: 1024
|
||||
mem_reservation: 600m
|
||||
cpu_shares: 1024
|
||||
mem_reservation: 600m
|
||||
volumes:
|
||||
- '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
|
||||
# - '/var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log'
|
||||
@ -53,7 +53,7 @@ services:
|
||||
|
||||
freedmrmon:
|
||||
container_name: freedmrmon
|
||||
cpu_shares: 512
|
||||
cpu_shares: 512
|
||||
depends_on:
|
||||
- freedmr
|
||||
volumes:
|
||||
@ -78,7 +78,7 @@ services:
|
||||
|
||||
freedmrmonpache:
|
||||
container_name: freedmrmonapache
|
||||
cpu_shares: 512
|
||||
cpu_shares: 512
|
||||
depends_on:
|
||||
- freedmrmon
|
||||
#Use to override html files
|
||||
@ -100,5 +100,5 @@ networks:
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: 172.16.238.0/24
|
||||
gateway: 172.16.238.1
|
||||
- subnet: 172.16.238.0/24
|
||||
gateway: 172.16.238.1
|
||||
|
Loading…
Reference in New Issue
Block a user