From 183964f08649733bdc9da1810c4f9b39280e3918 Mon Sep 17 00:00:00 2001
From: Simon Milvert <simon@milvert.com>
Date: Tue, 8 Dec 2020 06:08:16 +0100
Subject: [PATCH] Fixing restart

---
 docker-compose.database.yml | 17 ++++++++++-------
 docker-compose.per.yml      |  1 +
 docker-compose.service.yml  |  3 +++
 docker-compose.web.yml      |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docker-compose.database.yml b/docker-compose.database.yml
index 4411fa1..a867818 100644
--- a/docker-compose.database.yml
+++ b/docker-compose.database.yml
@@ -28,7 +28,6 @@ services:
     container_name: adminer
     restart: always
     networks:
-      - frontend
       - backend
     labels:
       - "traefik.enable=true"
@@ -46,8 +45,6 @@ services:
       - MYSQL_USER=${MYSQL_USERNAME}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - PMA_ARBITRARY=1
-    ports:
-      - 8000:8080
 
   postgres:
     image: postgres:13.1
@@ -76,10 +73,7 @@ services:
       PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
     volumes:
       - ${DIR}/database_pg/pgadmin:/root/.pgadmin
-    ports:
-      - "8009:80"
     networks:
-      - frontend
       - backend
     restart: unless-stopped
     depends_on:
@@ -92,7 +86,16 @@ services:
       - "traefik.http.routers.webpg-secure.rule=Host(`webpg.${DOMAIN}`)"
       - "traefik.http.routers.webpg-secure.tls.certresolver=milvert"
       - "traefik.http.routers.webpg-secure.tls=true"
-      - "traefik.http.services.webpg-service.loadbalancer.server.port=8080"
+      #- "traefik.http.services.webpg-service.loadbalancer.server.port=8080"
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    restart: always
+    networks:
+      - backend
+    volumes:
+        - ${DIR}/redis:/var/lib/redis
 
 networks:
   frontend:
diff --git a/docker-compose.per.yml b/docker-compose.per.yml
index 1429e6a..102247a 100644
--- a/docker-compose.per.yml
+++ b/docker-compose.per.yml
@@ -51,6 +51,7 @@ services:
     environment:
       PMA_HOST: db_peek
 
+
 networks:
   frontend:
     external: true
diff --git a/docker-compose.service.yml b/docker-compose.service.yml
index 4c78d65..48bea90 100644
--- a/docker-compose.service.yml
+++ b/docker-compose.service.yml
@@ -7,6 +7,7 @@ services:
     networks:
       - backend
     image: koenkk/zigbee2mqtt:1.15.0
+    restart: always
     volumes:
       - ./zigbee_home_2:/app/data
       - ./zigbee_home_2/configuration_home_2.yaml:/app/data/configuration.yaml
@@ -22,6 +23,7 @@ services:
     networks:
       - backend
     image: koenkk/zigbee2mqtt:1.15.0
+    restart: always
     volumes:
       - ${DIR}/zigbee2matt:/app/data
       - ${DIR}/zigbee2mqtt_node_log:/root/.npm
@@ -35,6 +37,7 @@ services:
   grafana:
     image: grafana/grafana:7.3.1
     container_name: grafana
+    restart: always
     networks:
       - backend
     volumes:
diff --git a/docker-compose.web.yml b/docker-compose.web.yml
index 66d1055..a94bf1b 100644
--- a/docker-compose.web.yml
+++ b/docker-compose.web.yml
@@ -38,6 +38,7 @@ services:
     # A container that exposes an API to show its IP address
     container_name: ttrss
     image: wangqiru/ttrss:latest
+    restart: unless-stopped
     networks:
       - backend
     environment:
@@ -62,7 +63,6 @@ services:
     container_name: diak
     networks:
       - backend
-      - frontend
     ports:
       - 8003:80
         #devices: