From d2cc809f5ca9ec54b0628b98ced652e608db1571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Tue, 3 Sep 2019 10:43:12 +0200
Subject: [PATCH] Replace mysql-client init by mysql

---
 tutorxqueue/__about__.py                                  | 2 +-
 tutorxqueue/patches/local-docker-compose-services         | 8 ++++----
 tutorxqueue/plugin.py                                     | 2 +-
 .../templates/xqueue/hooks/{mysql-client => mysql}/init   | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename tutorxqueue/templates/xqueue/hooks/{mysql-client => mysql}/init (100%)

diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py
index d1f2e39..48fef32 100644
--- a/tutorxqueue/__about__.py
+++ b/tutorxqueue/__about__.py
@@ -1 +1 @@
-__version__ = "0.1.1"
\ No newline at end of file
+__version__ = "0.1.2"
\ No newline at end of file
diff --git a/tutorxqueue/patches/local-docker-compose-services b/tutorxqueue/patches/local-docker-compose-services
index 5424688..6c27d0a 100644
--- a/tutorxqueue/patches/local-docker-compose-services
+++ b/tutorxqueue/patches/local-docker-compose-services
@@ -7,8 +7,8 @@ xqueue:
   environment:
     DJANGO_SETTINGS_MODULE: xqueue.tutor
   restart: unless-stopped
-  {% if ACTIVATE_MYSQL %}depends_on:
-    - mysql{% endif %}
+  depends_on:
+    - mysql
 
 xqueue_consumer:
   image: {{ DOCKER_REGISTRY }}{{ XQUEUE_DOCKER_IMAGE }}
@@ -20,5 +20,5 @@ xqueue_consumer:
   restart: unless-stopped
   entrypoint: ["sh", "-e", "-c"]
   command: ["while true; do echo 'running consumers'; ./manage.py run_consumer; sleep 10; done"]
-  {% if ACTIVATE_MYSQL %}depends_on:
-    - mysql{% endif %}
\ No newline at end of file
+  depends_on:
+    - mysql
\ No newline at end of file
diff --git a/tutorxqueue/plugin.py b/tutorxqueue/plugin.py
index 9b00c08..2977493 100644
--- a/tutorxqueue/plugin.py
+++ b/tutorxqueue/plugin.py
@@ -23,7 +23,7 @@ config = {
 
 templates = pkg_resources.resource_filename("tutorxqueue", "templates")
 hooks = {
-    "init": ["mysql-client", "xqueue"],
+    "init": ["mysql", "xqueue"],
     "build-image": {"xqueue": "{{ XQUEUE_DOCKER_IMAGE }}"},
     "remote-image": {"xqueue": "{{ XQUEUE_DOCKER_IMAGE }}"},
 }
diff --git a/tutorxqueue/templates/xqueue/hooks/mysql-client/init b/tutorxqueue/templates/xqueue/hooks/mysql/init
similarity index 100%
rename from tutorxqueue/templates/xqueue/hooks/mysql-client/init
rename to tutorxqueue/templates/xqueue/hooks/mysql/init