From 0172b193a19bd381fb51075d31851f2a1135354f Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Fri, 23 Apr 2021 14:29:34 +0200
Subject: [PATCH] Modernized Firefly config

---
 firefly/.env.example       |  2 +-
 firefly/docker-compose.yml | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/firefly/.env.example b/firefly/.env.example
index 164c22c..58202bb 100644
--- a/firefly/.env.example
+++ b/firefly/.env.example
@@ -63,7 +63,7 @@ DB_HOST=db
 DB_PORT=5432
 DB_DATABASE=firefly
 DB_USERNAME=firefly
-DB_PASSWORD=password
+DB_PASSWORD=firefly
 
 # MySQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
diff --git a/firefly/docker-compose.yml b/firefly/docker-compose.yml
index 65e501e..73a8f98 100644
--- a/firefly/docker-compose.yml
+++ b/firefly/docker-compose.yml
@@ -6,24 +6,23 @@ services:
             context: '.'
             args:
                 - 'LOCALE=$DEFAULT_LOCALE'
-        image: 'firefly-iii-cron:latest'
+        image: 'chewingbever/firefly-iii-cron:latest'
         restart: 'always'
+
         healthcheck:
             test: 'curl -f localhost:8080 || exit 1'
             interval: '1m'
             timeout: '10s'
             retries: 3
             start_period: '10s'
-
         depends_on:
             db:
                 condition: 'service_healthy'
             redis:
                 condition: 'service_healthy'
+
         env_file:
             - '.env'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
         networks:
             - 'nginx'
             - 'default'
@@ -31,25 +30,24 @@ services:
             - 'upload:/var/www/html/storage/upload'
 
     db:
-        image: 'postgres:13-alpine'
+        image: 'postgres:13.2-alpine'
         restart: 'always'
         healthcheck:
-            test: 'pg_isready -U $DB_USERNAME'
+            test: 'pg_isready -U firefly'
             interval: '10s'
             timeout: '5s'
             retries: 5
+            start_period: '0s'
 
         environment:
-            - 'POSTGRES_DB=$DB_DATABASE'
-            - 'POSTGRES_PASSWORD=$DB_PASSWORD'
-            - 'POSTGRES_USER=$DB_USERNAME'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
+            - 'POSTGRES_DB=firefly'
+            - 'POSTGRES_PASSWORD=firefly'
+            - 'POSTGRES_USER=firefly'
         volumes:
             - 'db-data:/var/lib/postgresql/data'
 
     redis:
-        image: 'redis:6-alpine'
+        image: 'redis:6.0.12-alpine'
         restart: 'always'
         healthcheck:
             test: 'redis-cli -h localhost ping'
@@ -57,9 +55,6 @@ services:
             timeout: '5s'
             retries: 3
 
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
-
 networks:
     nginx:
         external: true