Skip to content

Commit e4f538d

Browse files
authored
Merge pull request #360 from CachetHQ/djdefi-postgres-latest
Bump database container versions
2 parents fdb7e67 + da5f7ce commit e4f538d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
postgres:
5-
image: postgres:9.5
5+
image: postgres:12-alpine
66
volumes:
77
- /var/lib/postgresql/data
88
environment:

test/docker-compose-mysql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
mysql:
5-
image: mysql:5.7
5+
image: mariadb:bionic
66
environment:
77
- MYSQL_ROOT_PASSWORD=mysql
88
- MYSQL_USER=mysql

test/test.full.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ load "lib/output"
1717
}
1818

1919
@test "[$TEST_FILE] check for postgres database startup" {
20-
docker_wait_for_log docker_postgres_1 120 "LOG: autovacuum launcher started"
20+
docker_wait_for_log docker_postgres_1 120 "LOG: database system is ready to accept connections"
2121
}
2222

2323
@test "[$TEST_FILE] check for empty sessions table" {

test/test.mysql.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ load "lib/output"
1313
}
1414

1515
@test "[$TEST_FILE] check for database startup" {
16-
docker_wait_for_log test_mysql_1 120 "[Note] mysqld: ready for connections."
16+
docker_wait_for_log test_mysql_1 120 "mysqld: ready for connections."
1717
}
1818

1919
@test "[$TEST_FILE] check for empty sessions table" {

0 commit comments

Comments
 (0)