From 2e57f558be26f52148d824e41afcde8e4c0ba126 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Fri, 8 Mar 2019 20:18:03 -0500 Subject: [PATCH] Fix path for sql scripts Issue-ID: SO-1605 Change-Id: I2a1cc1e6f2b1039b7ce8f556d524dc919d4a9fc4 Signed-off-by: Brian Freeman --- volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh | 3 +++ .../{ => db-sql-scripts}/mariadb_engine_7.10.0.sql | 2 ++ .../{ => db-sql-scripts}/mariadb_identity_7.10.0.sql | 2 ++ 3 files changed, 7 insertions(+) rename volumes/mariadb/docker-entrypoint-initdb.d/{ => db-sql-scripts}/mariadb_engine_7.10.0.sql (99%) rename volumes/mariadb/docker-entrypoint-initdb.d/{ => db-sql-scripts}/mariadb_identity_7.10.0.sql (99%) diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh index 16c2213..021e738 100644 --- a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh +++ b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh @@ -26,12 +26,15 @@ echo "Creating camundabpmn database . . ." mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1 DROP DATABASE IF EXISTS `camundabpmn`; CREATE DATABASE `camundabpmn`; +DROP USER 'camundauser'; DELETE FROM mysql.user WHERE User='camundauser'; CREATE USER 'camundauser'; GRANT ALL on camundabpmn.* to 'camundauser' identified by 'camunda123' with GRANT OPTION; FLUSH PRIVILEGES; EOF +cd /docker-entrypoint-initdb.d/db-sql-scripts + mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_engine_7.10.0.sql || exit 1 mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_identity_7.10.0.sql || exit 1 diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/mariadb_engine_7.10.0.sql b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.10.0.sql similarity index 99% rename from volumes/mariadb/docker-entrypoint-initdb.d/mariadb_engine_7.10.0.sql rename to volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.10.0.sql index 6c9a7be..41377fb 100644 --- a/volumes/mariadb/docker-entrypoint-initdb.d/mariadb_engine_7.10.0.sql +++ b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.10.0.sql @@ -14,6 +14,8 @@ -- limitations under the License. -- +use camundabpmn; + create table ACT_GE_PROPERTY ( NAME_ varchar(64), VALUE_ varchar(300), diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/mariadb_identity_7.10.0.sql b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_identity_7.10.0.sql similarity index 99% rename from volumes/mariadb/docker-entrypoint-initdb.d/mariadb_identity_7.10.0.sql rename to volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_identity_7.10.0.sql index 8b951a2..35cb979 100644 --- a/volumes/mariadb/docker-entrypoint-initdb.d/mariadb_identity_7.10.0.sql +++ b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_identity_7.10.0.sql @@ -14,6 +14,8 @@ -- limitations under the License. -- +use camundabpmn; + create table ACT_ID_GROUP ( ID_ varchar(64), REV_ integer, -- 2.16.6