From cbd779fd93c12deac8d7e855580fb239416d2c66 Mon Sep 17 00:00:00 2001
From: kirby <kirby@hyrule.ovh>
Date: Mon, 3 Apr 2023 17:19:36 +0200
Subject: [PATCH] Working build with database migrations

---
 Dockerfile                   | 14 ++++++--------
 docker-compose.yml           |  2 +-
 docker/scripts/entrypoint.sh |  3 +++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 62fa892..b85f1c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@ ARG APP_GID=1000
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
+WORKDIR /app/
+
+RUN apt update && apt install -y netcat libmariadb-dev-compat libmariadb-dev mariadb-client gcc
+
 COPY ./docker/scripts/entrypoint.sh /usr/local/bin/entrypoint
 RUN chmod +x /usr/local/bin/entrypoint
 
-WORKDIR /app/
-
 RUN addgroup --system gunicorn --gid ${APP_GID} && adduser --uid ${APP_UID} --system --disabled-login --group gunicorn
 
-RUN apt update && apt install -y netcat libmariadb-dev-compat libmariadb-dev mariadb-client gcc
-
 RUN pip install --upgrade pip
 COPY ./app/requirements.txt .
 RUN pip install -r requirements.txt
@@ -23,12 +23,10 @@ RUN pip install -r requirements.txt
 COPY ./app/ .
 COPY ./app/updatesdashboard/.env.dev ./updatesdashboard/.env
 
-#ENTRYPOINT tail -f /dev/null
-
 RUN python /app/manage.py makemigrations
 RUN python /app/manage.py makemigrations dashboard
 RUN python /app/manage.py collectstatic
 
 RUN rm -f ./updatesdashboard/.env
-ENTRYPOINT tail -f /dev/null
-#ENTRYPOINT ["/usr/local/bin/gunicorn","/app/manage.py","updatesdashboard.wsgi:application"]
+
+ENTRYPOINT ["/usr/local/bin/entrypoint","mysql","3306"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 217da31..327d1d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
             - "3306:3306"
         networks:
             - updates-dashboard-network
-
 networks:
     updates-dashboard-network:
         driver: bridge
+
diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index e06069f..ceda1db 100644
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
 until nc -vz $1 $2; do echo "Waiting for MySQL $1:$2..."; sleep 3; done;
+
+python /app/manage.py migrate
+python /app/manage.py loaddata dashboard/fixtures/os.yaml