From 2fda99fa1d214b2190cb9c636c64f54579610802 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sat, 6 Jan 2024 12:10:16 +0100
Subject: [PATCH] Solved baserow bugs

---
 roles/docker-baserow/templates/docker-compose.yml.j2 | 10 ++++++++--
 roles/docker-baserow/templates/env.j2                |  4 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index c9dd7ecb..44388499 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -6,8 +6,9 @@ services:
 
 {% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
-  baserow:
+  application:
     image: baserow/baserow:1.19.1
+    container_name: baserow-application
     restart: always
     logging:
       driver: journald
@@ -17,8 +18,13 @@ services:
       - data:/baserow/data
     ports:
       - "{{http_port}}:80"
+        healthcheck:
+    test: ["CMD", "curl", "-f", "http://localhost:80/"]
+    interval: 1m
+    timeout: 10s
+    retries: 3
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/roles/docker-baserow/templates/env.j2 b/roles/docker-baserow/templates/env.j2
index 5a756e2b..cd4fe8f3 100644
--- a/roles/docker-baserow/templates/env.j2
+++ b/roles/docker-baserow/templates/env.j2
@@ -15,6 +15,4 @@ DATABASE_HOST={{ database_host }}
 DATABASE_PORT=5432
 DATABASE_PASSWORD={{ database_password }}
 
-REDIS_HOST=redis
-REDIS_PORT=6379
-REDIS_PASSWORD=
+REDIS_URL=redis://redis:6379