Skip to content

Commit ed95a64

Browse files
committed
[test] fix issue with docker setup and mysql
ActiveRecord::Base.establish_connection doesn't like underscores
1 parent fd73345 commit ed95a64

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

test/run_tests/docker-compose.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ services:
3131
environment:
3232
- APPOPTICS_SERVICE_KEY=${APPOPTICS_SERVICE_KEY}
3333
- APPOPTICS_COLLECTOR=${APPOPTICS_COLLECTOR}
34-
- APPOPTICS_RABBITMQ_SERVER=ao_ruby_rabbitmq
34+
- APPOPTICS_RABBITMQ_SERVER=ao-ruby-rabbitmq
3535
- DOCKER_MYSQL_PASS=admin
3636
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
3737
- MYSQL_ROOT_PASSWORD=admin
38-
- MYSQL_HOST=ao_ruby_mysql
39-
- APPOPTICS_MONGO_SERVER=ao_ruby_mongo
38+
- MYSQL_HOST=ao-ruby-mysql
39+
- APPOPTICS_MONGO_SERVER=ao-ruby-mongo
4040
- BUNDLE_GEMFILE=gemfiles/libraries.gemfile
4141
# - SIMPLECOV_COVERAGE=True
4242

@@ -55,32 +55,32 @@ services:
5555
# links:
5656
# - wait
5757
# environment:
58-
# - APPOPTICS_RABBITMQ_SERVER=rabbitmq
58+
# - APPOPTICS_RABBITMQ_SERVER=ao-ruby-rabbitmq
5959
# - DOCKER_MYSQL_PASS=admin
6060
# - MYSQL_ALLOW_EMPTY_PASSWORD=yes
6161
# - MYSQL_ROOT_PASSWORD=admin
6262
# - MYSQL_HOST=mysql
63-
# - APPOPTICS_MONGO_SERVER=mongo
63+
# - APPOPTICS_MONGO_SERVER=ao-ruby-mongo
6464

65-
ao_ruby_rabbitmq:
66-
container_name: ao_ruby_rabbitmq
65+
ao-ruby-rabbitmq:
66+
container_name: ao-ruby-rabbitmq
6767
image: rabbitmq:3-management
6868
# ports:
6969
# - "8080:15672"
7070
# - "5672:5672"
7171
# - "5671:5671"
7272

73-
ao_ruby_mysql:
74-
container_name: ao_ruby_mysql
73+
ao-ruby-mysql:
74+
container_name: ao-ruby-mysql
7575
image: mysql:5.7.13
7676
environment:
7777
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
7878
- MYSQL_ROOT_PASSWORD=admin
7979
# ports:
8080
# - "3306:3306"
8181

82-
ao_ruby_mongo:
83-
container_name: ao_ruby_mongo
82+
ao-ruby-mongo:
83+
container_name: ao-ruby-mongo
8484
image: mongo:3.4
8585
# ports:
8686
# - "27017:27017"
@@ -89,13 +89,13 @@ services:
8989
container_name: ao_ruby_wait
9090
image: waisbrot/wait
9191
depends_on:
92-
- ao_ruby_rabbitmq
93-
- ao_ruby_mysql
94-
- ao_ruby_mongo
92+
- ao-ruby-rabbitmq
93+
- ao-ruby-mysql
94+
- ao-ruby-mongo
9595
links:
96-
- ao_ruby_rabbitmq
97-
- ao_ruby_mysql
98-
- ao_ruby_mongo
96+
- ao-ruby-rabbitmq
97+
- ao-ruby-mysql
98+
- ao-ruby-mongo
9999
# environment:
100-
# - TARGETS=mysql:3306;rabbitmq:5672;mongo:27017
100+
# - TARGETS=ao-ruby-mysql:3306;ao-ruby-rabbitmq:5672;ao-ruby-mongo:27017
101101

0 commit comments

Comments
 (0)