From acee8ce326471f145f59fa0c9b84ebb7aaa9c9ef Mon Sep 17 00:00:00 2001
From: Beth Skurrie <beth@bethesque.com>
Date: Wed, 2 Dec 2020 15:12:06 +1100
Subject: [PATCH] chore: allow test command to be customised in mysql container

---
 docker-compose-ci-mysql.yml                     | 3 ++-
 script/docker-container/test.sh                 | 3 +++
 script/test/run-rake-on-docker-compose-mysql.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100755 script/docker-container/test.sh

diff --git a/docker-compose-ci-mysql.yml b/docker-compose-ci-mysql.yml
index d58433944..29eedb1c1 100644
--- a/docker-compose-ci-mysql.yml
+++ b/docker-compose-ci-mysql.yml
@@ -12,7 +12,7 @@ services:
     ports:
       - "3306:3306"
 
-  mysql-tests:
+  tests:
     build: .
     depends_on:
       - mysql
@@ -32,5 +32,6 @@ services:
       - ./.rubocop:/home/.rubocop
       - ./.gitignore:/home/.gitignore
       - ./public:/home/public
+      - ./script/docker-container/test.sh:/usr/local/bin/test
     entrypoint: dockerize
     command: --wait tcp://mysql:3306 -timeout 60s test
diff --git a/script/docker-container/test.sh b/script/docker-container/test.sh
new file mode 100755
index 000000000..7b90d85a5
--- /dev/null
+++ b/script/docker-container/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rake
diff --git a/script/test/run-rake-on-docker-compose-mysql.sh b/script/test/run-rake-on-docker-compose-mysql.sh
index e92cc3a0b..e7a3e73c7 100755
--- a/script/test/run-rake-on-docker-compose-mysql.sh
+++ b/script/test/run-rake-on-docker-compose-mysql.sh
@@ -5,4 +5,4 @@ cleanup() {
 }
 
 trap cleanup EXIT
-docker-compose -f docker-compose-ci-mysql.yml up --exit-code-from mysql-tests --abort-on-container-exit --remove-orphans
+docker-compose -f docker-compose-ci-mysql.yml up --exit-code-from tests --abort-on-container-exit --remove-orphans