From ec36f7c8662d3a90e78d6c59d8d45e11dbce16ab Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Fri, 21 Dec 2018 10:39:47 -0500 Subject: Database issues with mdbc docker env Two problems: The docker-compose scripts are pulling in an older version of mariadb that doesn't have the JSON functions we need. We can use 10.3.11, which is the latest stable release. The DB user needs to have the SUPER privilege so that mdbc can add database triggers. Change-Id: Ic9b2daeb0196a2134f9260b39a41a4a10be01a06 Issue-ID: MUSIC-266 Signed-off-by: Rob Daugherty --- mdbc-packages/mdbc-docker/compose/one-site/docker-compose.yml | 2 +- .../mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh | 1 + mdbc-packages/mdbc-docker/compose/two-sites/docker-compose.yml | 4 ++-- .../mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'mdbc-packages/mdbc-docker/compose') diff --git a/mdbc-packages/mdbc-docker/compose/one-site/docker-compose.yml b/mdbc-packages/mdbc-docker/compose/one-site/docker-compose.yml index ca597ad..2352e95 100644 --- a/mdbc-packages/mdbc-docker/compose/one-site/docker-compose.yml +++ b/mdbc-packages/mdbc-docker/compose/one-site/docker-compose.yml @@ -28,7 +28,7 @@ services: - -s0 ################################################################################ mariadb-1: - image: mariadb:10.1.11 + image: mariadb:10.3.11 container_name: mariadb-1 hostname: diff --git a/mdbc-packages/mdbc-docker/compose/one-site/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh b/mdbc-packages/mdbc-docker/compose/one-site/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh index 3316153..4b414ef 100644 --- a/mdbc-packages/mdbc-docker/compose/one-site/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh +++ b/mdbc-packages/mdbc-docker/compose/one-site/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh @@ -24,5 +24,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l DELETE FROM mysql.user WHERE User='test'; CREATE USER 'test'; GRANT ALL ON test.* TO 'test' identified by 'password' with GRANT OPTION; +GRANT SUPER ON *.* TO 'test'; FLUSH PRIVILEGES; EOF diff --git a/mdbc-packages/mdbc-docker/compose/two-sites/docker-compose.yml b/mdbc-packages/mdbc-docker/compose/two-sites/docker-compose.yml index b1615fc..ed8a4b6 100644 --- a/mdbc-packages/mdbc-docker/compose/two-sites/docker-compose.yml +++ b/mdbc-packages/mdbc-docker/compose/two-sites/docker-compose.yml @@ -28,7 +28,7 @@ services: - -s0 ################################################################################ mariadb-1: - image: mariadb:10.1.11 + image: mariadb:10.3.11 container_name: mariadb-1 hostname: @@ -72,7 +72,7 @@ services: - "/app/start-mdbc-server.sh" ################################################################################ mariadb-2: - image: mariadb:10.1.11 + image: mariadb:10.3.11 container_name: mariadb-2 hostname: diff --git a/mdbc-packages/mdbc-docker/compose/two-sites/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh b/mdbc-packages/mdbc-docker/compose/two-sites/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh index 3316153..4b414ef 100644 --- a/mdbc-packages/mdbc-docker/compose/two-sites/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh +++ b/mdbc-packages/mdbc-docker/compose/two-sites/volumes/mariadb/docker-entrypoint-initdb.d/01-create-test-database.sh @@ -24,5 +24,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l DELETE FROM mysql.user WHERE User='test'; CREATE USER 'test'; GRANT ALL ON test.* TO 'test' identified by 'password' with GRANT OPTION; +GRANT SUPER ON *.* TO 'test'; FLUSH PRIVILEGES; EOF -- cgit