Skip to content

Commit 6673297

Browse files
authored
Merge pull request rails#54842 from yahonda/mysql_container
Use MySQL instead of MariaDB in devcontainer
2 parents 73761aa + e8e0cb0 commit 6673297

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.devcontainer/compose.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212

1313
depends_on:
1414
- postgres
15-
- mariadb
15+
- mysql
1616
- redis
1717
- memcached
1818

@@ -32,13 +32,13 @@ services:
3232
POSTGRES_DB: postgres
3333
POSTGRES_PASSWORD: postgres
3434

35-
mariadb:
36-
image: mariadb:lts
35+
mysql:
36+
image: mysql:latest
3737
restart: unless-stopped
3838
volumes:
39-
- mariadb-data:/var/lib/mysql
39+
- mysql-data:/var/lib/mysql
4040
environment:
41-
MARIADB_ROOT_PASSWORD: root
41+
MYSQL_ROOT_PASSWORD: root
4242

4343
redis:
4444
image: valkey/valkey:8
@@ -53,5 +53,5 @@ services:
5353

5454
volumes:
5555
postgres-data:
56-
mariadb-data:
56+
mysql-data:
5757
redis-data:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"PGHOST": "postgres",
2323
"PGUSER": "postgres",
2424
"PGPASSWORD": "postgres",
25-
"MYSQL_HOST": "mariadb",
25+
"MYSQL_HOST": "mysql",
2626
"REDIS_URL": "redis://redis/0",
2727
"MEMCACHE_SERVERS": "memcached:11211"
2828
},

0 commit comments

Comments
 (0)