ShaYmez
/
RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Simon 2021-10-09 20:17:07 +00:00
parent 5b17aad92c 3f5182b741
commit 48611c79f7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-configs/docker-compose-ipv6.yml
View File

@ -112,7 +112,7 @@ networks:
ipam: ipam:
driver: default driver: default
config: config:
- subnet: 172.16.238.0/24 - subnet: 172.16.238.0/24
gateway: 172.16.238.1 gateway: 172.16.238.1
- subnet: fd2a:70b6:9f54:29b6::/64 - subnet: fd2a:70b6:9f54:29b6::/64
gateway: fd2a:70b6:9f54:29b6::1 gateway: fd2a:70b6:9f54:29b6::1

12
docker-configs/docker-compose.yml
View File

@ -20,8 +20,8 @@ version: '2.4'
services: services:
freedmr: freedmr:
container_name: freedmr container_name: freedmr
cpu_shares: 1024 cpu_shares: 1024
mem_reservation: 600m mem_reservation: 600m
volumes: volumes:
- '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg' - '/etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg'
# - '/var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log' # - '/var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log'
@ -53,7 +53,7 @@ services:
freedmrmon: freedmrmon:
container_name: freedmrmon container_name: freedmrmon
cpu_shares: 512 cpu_shares: 512
depends_on: depends_on:
- freedmr - freedmr
volumes: volumes:
@ -78,7 +78,7 @@ services:
freedmrmonpache: freedmrmonpache:
container_name: freedmrmonapache container_name: freedmrmonapache
cpu_shares: 512 cpu_shares: 512
depends_on: depends_on:
- freedmrmon - freedmrmon
#Use to override html files #Use to override html files
@ -100,5 +100,5 @@ networks:
ipam: ipam:
driver: default driver: default
config: config:
- subnet: 172.16.238.0/24 - subnet: 172.16.238.0/24
gateway: 172.16.238.1 gateway: 172.16.238.1