From b085e21b991126d2fd2b8fc0983b8cf4c8cb81d0 Mon Sep 17 00:00:00 2001
From: Carlo Beltrame <carlo@beltra.me>
Date: Wed, 22 Mar 2023 14:51:41 +0100
Subject: [PATCH] Fix test setup with docker compose (new version)

---
 bin/test_env_core  | 2 +-
 bin/test_env_wagon | 2 +-
 docker-compose.yml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/test_env_core b/bin/test_env_core
index 0b816a3..283d2b6 100755
--- a/bin/test_env_core
+++ b/bin/test_env_core
@@ -2,4 +2,4 @@
 
 source $(dirname $0)/_basics
 
-docker-compose run rails_test_core bundle exec bash "$@"
+docker-compose run --rm rails_test_core bundle exec bash "$@"
diff --git a/bin/test_env_wagon b/bin/test_env_wagon
index bdd836c..f12962f 100755
--- a/bin/test_env_wagon
+++ b/bin/test_env_wagon
@@ -2,7 +2,7 @@
 
 source $(dirname $0)/_basics
 
-docker-compose run \
+docker-compose run --rm \
   --workdir=/usr/src/app/hitobito_$WAGON \
   -e RAILS_ENV=test \
   rails \
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d1d98e..8e9514e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -91,6 +91,7 @@ services:
     - "33066:3306"
     volumes:
     - ./docker/mysql-setup.sql:/docker-entrypoint-initdb.d/mysql-setup.sql:ro
+    - ./docker/test-setup.sql:/docker-entrypoint-initdb.d/test-setup.sql:ro
     - db:/var/lib/mysql
 
   webpack: