From 609c135acfd236755c96c932136ca990ed569f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Wed, 17 Jun 2020 20:06:51 +0200
Subject: [PATCH] Make Django migrations sync to DB availability

---
 docker/django/Dockerfile  | 4 +++-
 docker/docker-compose.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/django/Dockerfile b/docker/django/Dockerfile
index 115faf8..5d5af58 100644
--- a/docker/django/Dockerfile
+++ b/docker/django/Dockerfile
@@ -8,7 +8,9 @@ FROM python:3.8-alpine
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_SETTINGS_MODULE "beer.settings"
 
-RUN apk update && apk add --no-cache postgresql-libs
+RUN apk update && apk add --no-cache postgresql-libs \
+        && wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz -qO- \
+        | tar -xz -C /usr/local/bin
 COPY --from=builder /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
 COPY --chown=1000:1000 beer /srv/app/beer
 COPY --chown=1000:1000 requirements.txt /tmp/requirements.txt
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6b35439..63be72b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -75,9 +75,11 @@ services:
     image: daniviga/beer
     volumes:
       - "../beer:/srv/app/beer"
-    command: ["python3", "manage.py", "migrate", "--noinput"]
+    command: ["dockerize", "-wait", "tcp://timescale:5432", "python3", "manage.py", "migrate", "--noinput"]
     networks:
       - net
+    depends_on:
+      - timescale
 
   mqtt-to-db:
     <<: *service_default