From 699316ad1a29f726de2550f047d21a21898fb64b Mon Sep 17 00:00:00 2001
From: Chris Adams <chris@productscience.co.uk>
Date: Thu, 16 May 2024 18:23:11 +0200
Subject: [PATCH] Get the first GMT scenario giving a passing result

---
 compose.yaml                     |  2 +-
 greenweb/settings/development.py |  5 ++++-
 usage_scenario.yml               | 26 +++++++++++++++++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 28ff8b77..06d439ed 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,6 @@
 
 services:
-  db:
+  mariadb:
     image: mariadb:10.11
     restart: always
     environment:
diff --git a/greenweb/settings/development.py b/greenweb/settings/development.py
index 26c73388..448a7645 100644
--- a/greenweb/settings/development.py
+++ b/greenweb/settings/development.py
@@ -5,7 +5,10 @@
 INTERNAL_IPS = ["127.0.0.1"]
 hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
 INTERNAL_IPS += [ip[:-1] + "1" for ip in ips]
-ALLOWED_HOSTS.extend(["127.0.0.1", "localhost"])  # noqa
+
+# django is added to allow for the app to server requests in a
+# docker compose environment, or in green metrics tool
+ALLOWED_HOSTS.extend(["127.0.0.1", "localhost", "django"])  # noqa
 
 INSTALLED_APPS.append("debug_toolbar")  # noqa
 
diff --git a/usage_scenario.yml b/usage_scenario.yml
index b84008c7..309766d3 100644
--- a/usage_scenario.yml
+++ b/usage_scenario.yml
@@ -18,10 +18,6 @@ services:
       - MYSQL_DATABASE=greencheck
       - MYSQL_USER=deploy
       - MYSQL_PASSWORD=deploy
-    # not sure which of these take precedence now
-    # env:
-    #   MYSQL_ROOT_PASSWORD: just-for-github-actions
-    #   MYSQL_DATABASE: greencheck
     networks:
       - greencheck-network
 
@@ -45,13 +41,25 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+
+    # if we need to inspect the container, and make changes between runs
+    # mounting the volumes below allows for change to the most commonly
+    # changed files without needing to rebuild the container
+    # volumes:
+    #   - ./apps:/app/apps
+    #   - ./greenweb:/app/greenweb
+    # we use sleep 5 as a hack to wait for the database to be ready
+    setup-commands:
+      - sleep 5
+      - python manage.py migrate
+      - python manage.py collectstatic --noinput
     environment:
       - PORT=9000
       - GUNICORN_BIND_IP=0.0.0.0
       - PYTHONDONTWRITEBYTECODE=1
       - PYTHONUNBUFFERED=1
-      - DATABASE_URL=mysql://deploy:deploy@db:3306/greencheck
-      - DATABASE_URL_READ_ONLY=mysql://deploy:deploy@db:3306/greencheck
+      - DATABASE_URL=mysql://deploy:deploy@mariadb:3306/greencheck
+      - DATABASE_URL_READ_ONLY=mysql://deploy:deploy@mariadb:3306/greencheck
       - RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672/
       - DJANGO_SETTINGS_MODULE=greenweb.settings.development
     ports:
@@ -85,11 +93,15 @@ flow:
     container: test-container
     commands:
       - type: console
+        # this should trigger a http request to an API endpoint of http://django:9000, which should be the greencheck API
         command: npm test
         note: Starting test
         read-notes-stdout: true
+        stdin_open: true
+        log-stdout: true
+        log-stderr: true
+        tty: true
       - type: console
-        command: sleep 30
         note: Idling
       - type: console
         command: npm test