Fix docker compose files

docker-compose-data.yml → docker-compose-importer.yml

@@ -12,6 +12,7 @@ services:
   app:
     image: fireflyiii/core:latest
     hostname: app
+    container_name: firefly_iii_core
     networks:
       - firefly_iii
     restart: always
@@ -24,7 +25,8 @@ services:
       - db
   db:
     image: mariadb
-    hostname: fireflyiiidb
+    hostname: db
+    container_name: firefly_iii_db
     networks:
       - firefly_iii
     restart: always
@@ -35,6 +37,8 @@ services:
   importer:
     image: fireflyiii/data-importer:latest
     hostname: importer
+    restart: always
+    container_name: firefly_iii_importer
     networks:
       - firefly_iii
     restart: always
@@ -48,8 +52,11 @@ services:
     #
     # To make this work, set STATIC_CRON_TOKEN in your .env file or as an environment variable and replace REPLACEME below
     # The STATIC_CRON_TOKEN must be *exactly* 32 characters long
+    # Here is inspiration: https://www.random.org/strings/?num=1&len=32&digits=on&upperalpha=on&loweralpha=on&unique=on&format=html&rnd=new
     #
     image: alpine
+    container_name: firefly_iii_cron
+    restart: always
     command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/REPLACEME\" | crontab - && crond -f -L /dev/stdout"
     networks:
       - firefly_iii

docker-compose.yml

@@ -3,6 +3,8 @@ version: '3.3'
 services:
   app:
     image: fireflyiii/core:latest
+    hostname: app
+    container_name: firefly_iii_core
     restart: always
     volumes:
       - firefly_iii_upload:/var/www/html/storage/upload
@@ -15,7 +17,8 @@ services:
       - db
   db:
     image: mariadb    
-    hostname: fireflyiiidb
+    hostname: db
+    container_name: firefly_iii_db
     restart: always
     env_file: .db.env
     networks:
@@ -28,6 +31,8 @@ services:
     # The STATIC_CRON_TOKEN must be *exactly* 32 characters long
     #
     image: alpine
+    restart: always
+    container_name: firefly_iii_cron
     command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/REPLACEME\" | crontab - && crond -f -L /dev/stdout"
     networks:
       - firefly_iii

readme.md

@@ -54,10 +54,12 @@ The Firefly III Data Importer Docker image is built [on Azure](https://dev.azure
 * `fireflyiii/core:version-x.x.x`  
   A version tag, frozen to a specific patch version. Old version tags will be removed after about 6 months.
 
-## docker-compose.yml
+## docker-compose.yml and docker-compose-importer.yml
 
 This repository also contains the [docker-compose.yml](docker-compose.yml) file which you can use to instantly run a version of Firefly III with a MariaDB (aka MySQL) database.
 
+The alternative, [docker-compose-importer.yml](docker-compose-importer.yml) also contains the [Data Importer](https://docs.firefly-iii.org/data-importer/).
+
 Some people use another database image instead of the provided database. This is entirely up to you of course, but make sure you change the environment variables if you switch away from MySQL or MariaDB.
 
 ### Docker and system architectures
@@ -86,7 +88,7 @@ If you need support using Firefly III or the associated tools, come find us!
 - [GitHub Discussions for questions and support](https://github.com/firefly-iii/firefly-iii/discussions/)
 - [Gitter.im for a good chat and a quick answer](https://gitter.im/firefly-iii/firefly-iii)
 - [GitHub Issues for bugs and issues](https://github.com/firefly-iii/firefly-iii/issues)
-- [Follow me around for news and updates on Twitter](https://twitter.com/Firefly_iii)
+- [Follow me around for news and updates on Mastodon](https://fosstodon.org/@ff3)
 
 <!-- END OF HELP TEXT -->