From a0cc6bf0f90e244b7fa2ffb17b2f56eff19ad807 Mon Sep 17 00:00:00 2001
From: Danyal-Faheem <danyal.faheem@arbisoft.com>
Date: Wed, 27 Nov 2024 14:29:14 +0500
Subject: [PATCH] fix: do not run mysql as a dependency when RUN_MYSQL=False
 Aspects would fail if someone was using an external MySQL server We now only
 add MySQL as a dependency to containers if RUN_MYSQL=True

---
 tutoraspects/patches/local-docker-compose-dev-services  | 6 +++---
 tutoraspects/patches/local-docker-compose-jobs-services | 2 +-
 tutoraspects/patches/local-docker-compose-services      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tutoraspects/patches/local-docker-compose-dev-services b/tutoraspects/patches/local-docker-compose-dev-services
index 89f83e685..cc488745f 100644
--- a/tutoraspects/patches/local-docker-compose-dev-services
+++ b/tutoraspects/patches/local-docker-compose-dev-services
@@ -8,7 +8,7 @@ superset:
   ports:
     - 8088:{{ SUPERSET_PORT }}
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
     - superset-worker
     - superset-worker-beat
@@ -22,7 +22,7 @@ superset-worker:
   healthcheck:
     test: ["CMD-SHELL", "celery inspect ping -A superset.tasks.celery_app:app -d celery@$$HOSTNAME"]
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 
 superset-worker-beat:
@@ -34,7 +34,7 @@ superset-worker-beat:
   healthcheck:
     disable: true
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 {% endif %}
 
diff --git a/tutoraspects/patches/local-docker-compose-jobs-services b/tutoraspects/patches/local-docker-compose-jobs-services
index 71a186691..e2d24601d 100644
--- a/tutoraspects/patches/local-docker-compose-jobs-services
+++ b/tutoraspects/patches/local-docker-compose-jobs-services
@@ -32,6 +32,6 @@ superset-job:
     OPENEDX_LMS_ROOT_URL: "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}"
     OAUTH2_CLIENT_ID: {{ SUPERSET_OAUTH2_CLIENT_ID }}
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 {% endif %}
diff --git a/tutoraspects/patches/local-docker-compose-services b/tutoraspects/patches/local-docker-compose-services
index 92f6476f9..2825463f7 100644
--- a/tutoraspects/patches/local-docker-compose-services
+++ b/tutoraspects/patches/local-docker-compose-services
@@ -53,7 +53,7 @@ superset:
   ports:
     - 8088:{{ SUPERSET_PORT }}
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 
 superset-worker:
@@ -65,7 +65,7 @@ superset-worker:
   healthcheck:
     test: ["CMD-SHELL", "celery inspect ping -A superset.tasks.celery_app:app -d celery@$$HOSTNAME"]
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 
 superset-worker-beat:
@@ -77,7 +77,7 @@ superset-worker-beat:
   healthcheck:
     disable: true
   depends_on:
-    - mysql
+    {% if RUN_MYSQL %}- mysql{% endif %}
     - redis
 {% endif %}