diff --git a/compose/backup/docker-compose.yml b/compose/backup/docker-compose.yml index 6b4b374..73c68cc 100644 --- a/compose/backup/docker-compose.yml +++ b/compose/backup/docker-compose.yml @@ -35,15 +35,15 @@ services: image: registry.vbchaos.nl/rclone environment: - COMMAND=rclone copy -v /backup/ stackstorage:/julien/docker_config - - CRON_SCHEDULE=0 0-23/4 * * * + - CRON_SCHEDULE=*/1 * * * * configs: - source: stackstorage - target: /config/rclone.conf + target: /root/.config/rclone/rclone.conf volumes: - docker_config:/backup -# deploy: -# mode: replicated -# replicas: 1 + deploy: + placement: + constraints: [node.labels.isDNS == false] # repositories: # image: registry.vbchaos.nl/rclone:arm64 diff --git a/compose/registrybrowser/docker-compose.yml b/compose/registrybrowser/docker-compose.yml index d1cc94d..371bf74 100644 --- a/compose/registrybrowser/docker-compose.yml +++ b/compose/registrybrowser/docker-compose.yml @@ -21,6 +21,7 @@ services: - registryauth:/auth - registrystorage:/var/lib/registry environment: + - REGISTRY_STORAGE_DELETE_ENABLED=true - REGISTRY_AUTH=htpasswd - REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm - REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd diff --git a/homenetwork/swarm/grafana.yml b/homenetwork/swarm/grafana.yml index ec427b0..009d37a 100644 --- a/homenetwork/swarm/grafana.yml +++ b/homenetwork/swarm/grafana.yml @@ -1,46 +1,55 @@ version: '3.8' +networks: + grafana_network: + driver: overlay + attachable: true + +configs: + prometheus_config: + external: true + volumes: prometheus_data: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/grafana_prometheus_data + device: :/grafana_tmp_data/prometheus grafana_data: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/grafana/grafana + device: :/grafana_tmp_data/grafana loki_data: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/grafana/loki + device: :/grafana_tmp_data/loki services: - loki: - image: grafana/loki:2.6.1 - user: "0:0" - volumes: - - loki_data:/loki - ports: - - "3100:3100" - command: -config.file=/etc/loki/local-config.yaml +# loki: +# image: grafana/loki:2.6.1 +# user: "0:0" +# volumes: +# - loki_data:/loki +# ports: +# - "3100:3100" +# command: -config.file=/etc/loki/local-config.yaml - promtail: - image: grafana/promtail:2.6.1 - user: "0:0" - volumes: - - /var/log:/var/log - command: -config.file=/etc/promtail/config.yml +# promtail: +# image: grafana/promtail:2.6.1 +# user: "0:0" +# volumes: +# - /var/log:/var/log +# command: -config.file=/etc/promtail/config.yml prometheus: - user: "0:0" +# user: "0:0" hostname: prometheus image: prom/prometheus environment: @@ -52,24 +61,33 @@ services: - prometheus_data:/prometheus command: - '--config.file=/etc/prometheus/prometheus.yml' + networks: + - grafana_network ports: - 9090:9090 + deploy: + placement: + constraints: [node.labels.isDNS == false] grafana: - user: "0:0" +# user: "0:0" hostname: grafana image: grafana/grafana - depends_on: - - influx environment: - TZ=Europe/Amsterdam - configs: - - source: grafana_config - target: /etc/grafana/grafana.ini +# configs: +# - source: grafana_config +# target: /etc/grafana/grafana.ini volumes: - grafana_data:/var/lib/grafana + networks: + - grafana_network ports: - 3300:3000 + deploy: + placement: + constraints: [node.labels.isDNS == false] + node-exporter: image: prom/node-exporter:latest @@ -84,17 +102,24 @@ services: - '--path.rootfs=/rootfs' - '--path.sysfs=/host/sys' - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)' + networks: + - grafana_network ports: - "9100:9100" + deploy: + mode: global tado-exporter: - user: "1000:1000" image: registry.vbchaos.nl/tado-exporter:arm64 hostname: tado-exporter - environment: EXPORTER_USERNAME: matthias.mitscherlich@gmail.com EXPORTER_PASSWORD: 14Mai1984 - + networks: + - grafana_network ports: - "9898:9898" + deploy: + placement: + constraints: [node.labels.isDNS == false] + diff --git a/homenetwork/swarm/magicmirror.yml b/homenetwork/swarm/magicmirror.yml new file mode 100644 index 0000000..8ac1eab --- /dev/null +++ b/homenetwork/swarm/magicmirror.yml @@ -0,0 +1,40 @@ +version: '3' + +volumes: + magicmirror_config: + driver_opts: + type: nfs + o: addr=dockerstorage,nfsvers=4 + device: :/docker_config/magicmirror/config + + magicmirror_modules: + driver_opts: + type: nfs + o: addr=dockerstorage,nfsvers=4 + device: :/docker_config/magicmirror/modules + + magicmirror_css: + driver_opts: + type: nfs + o: addr=dockerstorage,nfsvers=4 + device: :/docker_config/magicmirror/css + + +services: + magicmirror: + image: karsten13/magicmirror:latest + ports: + - "8083:8080" + volumes: + - magicmirror_config:/opt/magic_mirror/config + - magicmirror_modules:/opt/magic_mirror/modules + - magicmirror_css:/opt/magic_mirror/css + restart: unless-stopped + command: + - npm + - run + - server + deploy: + placement: + constraints: [node.labels.isDNS == false] + diff --git a/homenetwork/swarm/start.sh b/homenetwork/swarm/start.sh index d7b9f63..f49ccf4 100755 --- a/homenetwork/swarm/start.sh +++ b/homenetwork/swarm/start.sh @@ -1 +1 @@ -docker stack deploy -c grafana.yml --with-registry-auth tado-exporter +docker stack deploy -c grafana.yml --with-registry-auth swarm