From aad853f6b0a990c21a8a511e9a76ef0bd5693ff2 Mon Sep 17 00:00:00 2001
From: JuniorJPDJ <git@juniorjpdj.pl>
Date: Sat, 16 Jul 2022 20:16:13 +0200
Subject: [PATCH] refactor(api/Dockerfile): move var default values to
 Dockerfile

---
 api/Dockerfile                   |  3 +++
 api/compose/django/entrypoint.sh | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index d4180576f..502341ce0 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -91,5 +91,8 @@ WORKDIR /app
 
 RUN find . -type d -exec chmod 755 {} \+
 
+ENV CACHE_URL="redis://redis:6379/0"
+ENV CELERY_BROKER_URL="redis://redis:6379/0"
+
 ENTRYPOINT ["./compose/django/entrypoint.sh"]
 CMD ["./compose/django/server.sh"]
diff --git a/api/compose/django/entrypoint.sh b/api/compose/django/entrypoint.sh
index 56a9b7375..ed3725419 100755
--- a/api/compose/django/entrypoint.sh
+++ b/api/compose/django/entrypoint.sh
@@ -4,8 +4,6 @@ set -e
 # Since docker-compose relies heavily on environment variables itself for configuration, we'd have to define multiple
 # environment variables just to support cookiecutter out of the box. That makes no sense, so this little entrypoint
 # does all this for us.
-export CACHE_URL=${CACHE_URL:="redis://redis:6379/0"}
-
 if [ -z "$DATABASE_URL" ]; then
   # the official postgres image uses 'postgres' as default user if not set explictly.
   if [ -z "$POSTGRES_ENV_POSTGRES_USER" ]; then
@@ -13,14 +11,4 @@ if [ -z "$DATABASE_URL" ]; then
   fi
   export DATABASE_URL=postgres://$POSTGRES_ENV_POSTGRES_USER:$POSTGRES_ENV_POSTGRES_PASSWORD@postgres:5432/$POSTGRES_ENV_POSTGRES_USER
 fi
-
-if [ -z "$CELERY_BROKER_URL" ]; then
-  export CELERY_BROKER_URL=$CACHE_URL
-fi
-
-# we copy the frontend files, if any so we can serve them from the outside
-if [ -d "frontend" ] && [ -d "/frontend" ]; then
-  cp -r frontend/* /frontend/
-  export FUNKWHALE_SPA_HTML_ROOT=/frontend/index.html
-fi
 exec "$@"