Clean up docker compose file.

docker-compose.dockerhub.yml

@@ -1,33 +0,0 @@
-version: '2'
-services:
-  firefly-db:
-    image: mysql:8
-    environment:
-      - MYSQL_DATABASE=firefly_db
-      - MYSQL_USER=firefly_db
-      - MYSQL_PASSWORD=firefly_db_secret
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-    volumes:
-      - firefly-storage:/var/lib/mysql
-
-  firefly-app:
-    image: 'jc5x/firefly-iii'
-    environment:
-      - FF_DB_HOST=firefly-db
-      - FF_DB_NAME=firefly_db
-      - FF_DB_USER=firefly_db
-      - FF_DB_PASSWORD=firefly_db_secret
-      - FF_APP_KEY=SomeRandomStringOf32CharsExactly
-      - FF_APP_ENV=local
-    ports:
-      - "9001:80"
-    links:
-      - firefly-db
-    volumes:
-      - firefly-app-storage:/var/www/firefly-iii/storage
-  
-volumes:
-  firefly-storage:
-    driver: local
-  firefly-app-storage:
-    driver: local

docker-compose.override.yml

@@ -1,16 +0,0 @@
-version: '2'
-
-services:
-  firefly-db:
-    volumes:
-      - firefly-dev-storage:/var/lib/mysql
-  firefly-app:
-    volumes:
-      - .:/var/www/firefly-iii
-    environment:
-      - INIT_DATABASE=yes
-      - FF_APP_ENV=development
-
-volumes:
-  firefly-dev-storage:
-    driver: local

docker-compose.prod.yml

@@ -1,12 +0,0 @@
-version: '2'
-
-services:
-  firefly-app:
-    environment:
-      - FF_APP_ENV=local
-    volumes:
-      - firefly-app-storage:/var/www/firefly-iii/storage
-
-volumes:
-  firefly-app-storage:
-    driver: local

docker-compose.yml

@@ -1,7 +1,6 @@
-version: '2'
-
+version: '3.2'
 services:
-  firefly-db:
+  firefly_iii_db:
     image: mysql:8
     environment:
       - MYSQL_DATABASE=firefly_db
@@ -9,23 +8,29 @@ services:
       - MYSQL_PASSWORD=firefly_db_secret
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
     volumes:
-      - firefly-storage:/var/lib/mysql
-
-  firefly-app:
-    image: firefly-iii
-    build: .
+      - firefly_iii_db:/var/lib/mysql
+  firefly_iii_app:
+    image: jc5x/firefly-iii
     environment:
-      - FF_DB_HOST=firefly-db
+      - FF_DB_HOST=firefly_iii_db
       - FF_DB_NAME=firefly_db
       - FF_DB_USER=firefly_db
       - FF_DB_PASSWORD=firefly_db_secret
-      - FF_APP_KEY=SomeRandomStringOf32CharsExactly
+      - FF_APP_KEY=S0m3R@nd0mStr1ngOf32Ch@rsEx@ctly
       - FF_APP_ENV=local
     ports:
       - "80:80"
+    volumes:
+      - type: volume
+        source: firefly_iii_export
+        target: /var/www/firefly-iii/storage/export
+      - type: volume
+        source: firefly_iii_upload
+        target: /var/www/firefly-iii/storage/upload
     links:
-      - firefly-db
+      - firefly_iii_db
 
 volumes:
-  firefly-storage:
-    driver: local
+  firefly_iii_db:
+  firefly_iii_export:
+  firefly_iii_upload: