From d89ba1095052db131f98278b278e4fe6e764d667 Mon Sep 17 00:00:00 2001
From: David <141665464+Dacid99@users.noreply.github.com>
Date: Sat, 25 May 2024 15:44:04 +0200
Subject: [PATCH] Added docker-compose including the FF3 importer  (#65)

* Create docker-compose.pico+firefly+installer.yml
* Adapt installation.md
* Consistency with docs
---
 docker-compose.pico+firefly+installer.yml | 90 +++++++++++++++++++++++
 docs/installation.md                      |  5 +-
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.pico+firefly+installer.yml

diff --git a/docker-compose.pico+firefly+installer.yml b/docker-compose.pico+firefly+installer.yml
new file mode 100644
index 0000000..2242c04
--- /dev/null
+++ b/docker-compose.pico+firefly+installer.yml
@@ -0,0 +1,90 @@
+version: '3.3'
+services:
+
+  firefly-pico:
+    image: cioraneanu/firefly-pico:latest
+    container_name: firefly_pico
+    restart: always
+    depends_on:
+      - firefly-pico-postgresql
+    ports:
+      - 6976:80
+    environment:
+      - FIREFLY_URL=http://firefly-app:8080
+      - DB_CONNECTION=pgsql
+      - DB_HOST=firefly-pico-postgresql
+      - DB_PORT=54322
+      - DB_DATABASE=firefly-pico
+      - DB_USERNAME=firefly-pico
+      - DB_PASSWORD=very-secure-pwd-pico
+      - TZ=Europe/London
+    networks:
+      firefly:
+
+  firefly-pico-postgresql:
+    image: postgres:latest
+    container_name: firefly_pico_db
+    restart: always
+    environment:
+      - POSTGRES_DB=firefly-pico
+      - POSTGRES_USER=firefly-pico
+      - POSTGRES_PASSWORD=very-secure-pwd-pico
+    volumes:
+      - /<your_path>/firefly-pico-db:/var/lib/postgresql/data
+    networks:
+      firefly:
+
+
+  firefly-app:
+    image: fireflyiii/core:latest
+    container_name: firefly_iii
+    restart: always
+    depends_on:
+      - firefly-app-postgresql
+    ports:
+      - 6041:8080
+    environment:
+      - FIREFLY_III_LAYOUT=v1
+      - APP_URL=https://firefly.domain.com
+      - APP_KEY=<add unique 32-char key>
+      - TRUSTED_PROXIES=**
+      - DB_CONNECTION=pgsql
+      - DB_HOST=firefly-app-postgresql
+      - DB_PORT=5432
+      - DB_DATABASE=firefly
+      - DB_USERNAME=firefly
+      - DB_PASSWORD=very-secure-pwd-firefly
+    volumes:
+      - /<your_path>/firefly-upload:/var/www/html/storage/upload
+    networks:
+      firefly:
+
+  firefly-app-postgresql:
+    image: postgres:latest
+    container_name: firefly_iii_db
+    restart: always
+    environment:
+      - POSTGRES_DB=firefly
+      - POSTGRES_USER=firefly
+      - POSTGRES_PASSWORD=very-secure-pwd-firefly
+    volumes:
+      - /<your_path>/firefly-db:/var/lib/postgresql/data
+    networks:
+      firefly:
+
+  importer:
+    image: fireflyiii/data-importer:latest
+    restart: always
+    container_name: firefly_iii_importer
+    ports:
+      - 4086:8080
+    depends_on:
+      - firefly-app
+    environment:
+      - FIREFLY_III_URL=http://firefly-app:8080
+      - VANITY_URL=http://firefly.domain.com  #omit this if you`re not using a reverse proxy
+    networks:
+      firefly:
+
+networks:
+  firefly:
diff --git a/docs/installation.md b/docs/installation.md
index 57c0784..f05bf4a 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -8,8 +8,9 @@
 1. Pick a docker-compose as a starting point:
 - [Pico only](../docker-compose.pico.yml) (If you already have Firefly installed)
 - [Pico + Firefly](../docker-compose.pico+firefly.yml) (If you want an easy 2 in 1)
+- [Pico + Firefly + Importer](../docker-compose.pico+firefly+importer.yml) (If you want an easy 2 in 1 and the importer as well)
 
-2. Change `FIREFLY_URL` to the URL of your **Firefly** instance. If you don't use a reverse proxy make sure you provide the full ip+port. <br>Ex. `http://192.168.1.10:8080` or `https://firefly.domain.com`
+2. Change `FIREFLY_URL`, `APP_URL` and `FIREFLY_III_URL` (if required) to the URL of your **Firefly** instance. If you don't use a reverse proxy make sure you provide the full ip+port. <br>Ex. `http://192.168.1.10:8080` or `https://firefly.domain.com`
 
 
 3. Change `DB_PASSWORD` and `POSTGRES_PASSWORD` to something secure. **Make sure they match!** If you want separate passwords for Pico and Firefly make sure they match for `pico-app <-> pico-db`, and `firefly-app <-> firefly-db`
@@ -71,4 +72,4 @@ If you've used Firefly before skip to step 3.
 
 3. Go to `"Options" -> "Profile" -> OAuth -> Create New Personal Access Token`. Save this token somewhere safe.
 
-4. Open **Pico** , go to `Settings -> App Config` and paste the token from the step above. In 99% of cases you don't need to change the `Pico Backend URL`. *DO NOT PUT FIREFLY URL HERE! :)*
\ No newline at end of file
+4. Open **Pico** , go to `Settings -> App Config` and paste the token from the step above. In 99% of cases you don't need to change the `Pico Backend URL`. *DO NOT PUT FIREFLY URL HERE! :)*