From 3c095d9d3b8c255cf5e6e3d5b5d534293bc882ca Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Thu, 14 Jan 2021 00:19:00 +1100
Subject: [PATCH] removed watchtower, doing that in cron to make hassio happy.
 added book* padb, switched to hassio :latest, and removed /dev/dri as it no
 longer exists on mara -- need to investigate that one

---
 docker-compose.yml | 49 +++++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c3b065f..a21a3ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.1'
+version: '3.7'
 services:
   traefik:
     container_name: traefik
@@ -99,8 +99,8 @@ services:
       - "traefik.http.services.emby.loadbalancer.server.port=8096"
       - "traefik.http.routers.emby.tls=true"
       - "traefik.http.routers.emby.entrypoints=secureweb"
-    devices:
-      - /dev/dri:/dev/dri
+#    devices:
+#      - /dev/dri:/dev/dri
 
   mail:
     image: tvial/docker-mailserver:latest
@@ -276,20 +276,8 @@ services:
       - "32414:32414"
       - "32469:32469"
 
-# auto-update docker images
-#  watchtower:
-#    image: containrrr/watchtower
-#    container_name: watchtower
-#    # should use --cleanup as well...
-#    command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup
-#    restart: always
-#    labels:
-#      - "com.centurylinklabs.watchtower.enable=true"
-#    volumes:
-#      - /var/run/docker.sock:/var/run/docker.sock
-
   hassio:
-    image: homeassistant/amd64-hassio-supervisor:2020.12.7
+    image: homeassistant/amd64-hassio-supervisor:latest
     container_name: hassio_supervisor
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
@@ -471,3 +459,32 @@ services:
       PGPASSWORD: NWNlfa01
     volumes:
       - '/srv/docker/container/bookdb/data:/var/lib/postgresql/data'
+      - '/srv/docker/container/bookdb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+
+  bookdb_web:
+    container_name: bookdb_web
+    build: '/home/ddp/src/pybook'
+    volumes:
+      - '/srv/docker/container/letsencrypt/etc:/etc/letsencrypt'
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"
+      - "traefik.enable=true"
+      - "traefik.tcp.routers.bookdb_web-tcp.rule=HostSNI(`book.depaoli.id.au`)"
+      - "traefik.tcp.routers.bookdb_web-tcp.tls.passthrough=true"
+      - "traefik.tcp.routers.bookdb_web-tcp.entrypoints=secureweb"
+
+  padb:
+    container_name: padb
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: for_now_pa
+      POSTGRES_USER: pa
+      POSTGRES_DB: pa
+      PGPASSWORD: for_now_overall_pg_pass
+    ports:
+      - '55432:5432'
+    volumes:
+      - '/srv/docker/container/padb/data:/var/lib/postgresql/data'
+      - '/srv/docker/container/padb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+