- Fix docker-compose migrations: avoid CELERY running migrations again / avoid tasks running makemigrations

Author: afabiani

entrypoint.sh

@@ -33,17 +33,16 @@ echo MONITORING_DATA_TTL=$MONITORING_DATA_TTL
 /usr/local/bin/invoke waitfordbs > /usr/src/geonode/invoke.log 2>&1
 echo "waitfordbs task done"
 
-echo "running migrations"
-/usr/local/bin/invoke migrations > /usr/src/geonode/invoke.log 2>&1
-echo "migrations task done"
-
 cmd="$@"
 
 echo DOCKER_ENV=$DOCKER_ENV
 
 if [ -z ${DOCKER_ENV} ] || [ ${DOCKER_ENV} = "development" ]
 then
 
+    echo "running migrations"
+    /usr/local/bin/invoke migrations > /usr/src/geonode/invoke.log 2>&1
+    echo "migrations task done"
     /usr/local/bin/invoke prepare > /usr/src/geonode/invoke.log 2>&1
     echo "prepare task done"
     /usr/local/bin/invoke fixtures > /usr/src/geonode/invoke.log 2>&1
@@ -72,6 +71,9 @@ else
         echo "Executing Celery server $cmd for Production"
     else
 
+        echo "running migrations"
+        /usr/local/bin/invoke migrations > /usr/src/geonode/invoke.log 2>&1
+        echo "migrations task done"
         /usr/local/bin/invoke prepare > /usr/src/geonode/invoke.log 2>&1
         echo "prepare task done"
 

tasks.py

@@ -185,8 +185,6 @@ def update(ctx):
 @task
 def migrations(ctx):
     print("**************************migrations*******************************")
-    ctx.run(f"python manage.py makemigrations --noinput --merge --settings={_localsettings()}", pty=True)
-    ctx.run(f"python manage.py makemigrations --noinput --settings={_localsettings()}", pty=True)
     ctx.run(f"python manage.py migrate --noinput --settings={_localsettings()}", pty=True)
     ctx.run(f"python manage.py updategeoip --settings={_localsettings()}", pty=True)
     try: