From 33cd309dea65450317f054613ff30eda52b57e96 Mon Sep 17 00:00:00 2001
From: Matan Horovitz <matanhorovitz@protonmail.com>
Date: Fri, 28 Oct 2022 11:20:43 +0300
Subject: [PATCH] Cleaning up for HatarashiHako & older changes

---
 docker-compose.yml | 55 +++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5d2b2e6..30fe8a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,35 +3,28 @@ version: '3'
 services:
   api:
     container_name: vikunja_api
-    image: vikunja/api
-    environment:
-      VIKUNJA_REDIS_ENABLED: 1
-      VIKUNJA_REDIS_HOST: 'redis:6379'
-      VIKUNJA_CACHE_ENABLED: 1
-      VIKUNJA_CACHE_TYPE: redis
-      VIKUNJA_DATABASE_TYPE: postgres
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
-      VIKUNJA_DATABASE_USER: vikunja
-      VIKUNJA_DATABASE_DATABASE: vikunja  
-      VIKUNJA_MAILER_ENABLED: "true"
-      VIKUNJA_MAILER_HOST: smtp.mail.yahoo.com
-      VIKUNJA_MAILER_PORT: 587
-      VIKUNJA_MAILER_USERNAME: pukekoxyz
-      VIKUNJA_MAILER_PASSWORD: pvefngmuhcxunzqs
-      VIKUNJA_MAILER_FROMEMAIL: pukekoxyz@yahoo.com
+    image: vikunja/api:latest
     volumes:
       - ./files:/app/vikunja/files
+      - ./config/config.yml:/etc/vikunja/config.yml
     depends_on:
       - db
     networks:
       - network
-      - internal
+      - dns_network
+    dns: 150.201.34.99
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=vikunja_network"
+      - "traefik.http.routers.vikunja-api.entrypoints=websecure"
+      - "traefik.http.routers.vikunja-api.rule=Host(`tasks.pukeko.xyz`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)"
+      - "traefik.http.routers.vikunja-api.tls.certresolver=pukekoresolver"
+      - "traefik.http.routers.vikunja-api.middlewares=authelia@docker"
     restart: unless-stopped
   redis:
-    image: redis
+    image: redis:latest
     networks:
-      - internal
+      - network
     restart: unless-stopped
   db:
     image: postgres:13
@@ -42,17 +35,15 @@ services:
       - ./db:/var/lib/postgresql/data
     restart: unless-stopped
     networks:
-      - internal
+      - network
   frontend:
     container_name: vikunja
-    image: vikunja/frontend
-    ports:
-      - 88:80
-    environment:
-      VIKUNJA_API_URL: https://tasks.pukeko.xyz/api/v1
+    image: vikunja/frontend:latest
+      #    ports:
+      #      - 88:80
+        #    environment:
+      #      VIKUNJA_API_URL: https://tasks.pukeko.xyz/api/v1
     restart: unless-stopped
-    networks:
-      - network
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=vikunja_network"
@@ -60,8 +51,12 @@ services:
       - "traefik.http.routers.vikunja.rule=Host(`tasks.pukeko.xyz`)"
       - "traefik.http.routers.vikunja.tls.certresolver=pukekoresolver"
       - "traefik.http.routers.vikunja.middlewares=authelia@docker"
+    networks:
+      - network
+      - dns_network
+    dns: 150.201.34.99
 networks:
   network:
     driver: bridge
-  internal:
-    driver: bridge
+  dns_network:
+    external: true