Skip to content

Commit 5d90179

Browse files
authored
Merge pull request #111 from Dahlgren/feature/docker-compose
Update docker-compose
2 parents b78499e + bc829b5 commit 5d90179

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,4 @@ RUBY VERSION
201201
ruby 2.7.8p225
202202

203203
BUNDLED WITH
204-
1.17.2
204+
2.1.4

docker-compose.yml

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
rails:
2-
build: .
3-
environment:
4-
MYSQL_HOST: mysql
5-
MYSQL_USERNAME: root
6-
MYSQL_PASSWORD: root
7-
MYSQL_DATABASE: anrop
8-
MYSQL_TEST_DATABASE: anrop_test
9-
links:
10-
- mysql
11-
ports:
12-
- "3000:3000"
13-
volumes:
14-
- .:/anrop
15-
mysql:
16-
image: mysql:5.6
17-
environment:
18-
MYSQL_ROOT_PASSWORD: root
19-
MYSQL_DATABASE: anrop
20-
ports:
21-
- "3306:3306"
1+
version: '2'
2+
3+
services:
4+
rails:
5+
build: .
6+
image: anrop/anrop-api
7+
environment:
8+
MYSQL_HOST: mysql
9+
MYSQL_USERNAME: root
10+
MYSQL_PASSWORD: root
11+
MYSQL_DATABASE: anrop
12+
MYSQL_TEST_DATABASE: anrop_test
13+
links:
14+
- mysql
15+
ports:
16+
- "3000:3000"
17+
volumes:
18+
- .:/anrop
19+
mysql:
20+
image: mysql:5.5
21+
environment:
22+
MYSQL_ROOT_PASSWORD: root
23+
MYSQL_DATABASE: anrop
24+
ports:
25+
- "3306:3306"

0 commit comments

Comments
 (0)