Fix test setup with docker compose (new version)

hitobito · Mar 22, 2023 · b085e21 · b085e21
1 parent c55efe6
commit b085e21
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 "$@"