diff options
| author |   Brendan Tschaen <ctschaen@att.com> | 2019-01-24 16:27:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-01-24 16:27:32 +0000 |
| commit | fa078d24e835af497d3286c4525ae09a6de8f3d9 (patch) | |
| tree | c44bd04267e43271274f8b4122caa1619eb852fa | |
| parent | cfb34c1b4f6701555df3bf7b9bdbf8caace966bc (diff) | |
| parent | ec36f7c8662d3a90e78d6c59d8d45e11dbce16ab (diff) | |
Merge "Database issues with mdbc docker env"
4 files changed, 5 insertions, 3 deletions
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 |