You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2022/03/31 18:11:24 UTC

[ranger] branch master updated: RANGER-3686: Docker setup updated to support MySQL database

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 85cee40  RANGER-3686: Docker setup updated to support MySQL database
85cee40 is described below

commit 85cee40684a097a33c5ea5129aa8a138964b8ee7
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Fri Mar 25 17:32:07 2022 -0700

    RANGER-3686: Docker setup updated to support MySQL database
---
 dev-support/ranger-docker/.env                     |  2 --
 dev-support/ranger-docker/Dockerfile.ranger        | 13 +++++---
 dev-support/ranger-docker/Dockerfile.ranger-hive   |  5 ++-
 ...ockerfile.ranger-db => Dockerfile.ranger-mysql} | 14 +++++---
 ...erfile.ranger-db => Dockerfile.ranger-postgres} |  0
 dev-support/ranger-docker/README.md                |  5 ++-
 .../ranger-hive-setup.sh => config/init_mysql.sql} | 37 +++++++++-------------
 dev-support/ranger-docker/config/my.cnf            | 23 ++++++++++++++
 .../ranger-docker/docker-compose.ranger-hive.yml   |  2 ++
 .../ranger-docker/docker-compose.ranger-mysql.yml  | 21 ++++++++++++
 .../docker-compose.ranger-postgres.yml             | 20 ++++++++++++
 .../ranger-docker/docker-compose.ranger.yml        | 14 ++------
 dev-support/ranger-docker/download-archives.sh     |  3 ++
 .../scripts/{hive-site.xml => hive-site-mysql.xml} |  4 +--
 .../{hive-site.xml => hive-site-postgres.xml}      |  0
 ...rties => ranger-admin-install-mysql.properties} |  9 +++---
 ...es => ranger-admin-install-postgres.properties} |  3 +-
 .../ranger-docker/scripts/ranger-hive-setup.sh     |  2 +-
 18 files changed, 123 insertions(+), 54 deletions(-)

diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 59a124b..0207981 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -3,8 +3,6 @@ SKIPTESTS=true
 GIT_URL=https://github.com/apache/ranger.git
 BRANCH=master
 
-POSTGRES_PASSWORD=rangerR0cks!
-
 RANGER_VERSION=3.0.0-SNAPSHOT
 HADOOP_VERSION=3.3.0
 HBASE_VERSION=2.2.6
diff --git a/dev-support/ranger-docker/Dockerfile.ranger b/dev-support/ranger-docker/Dockerfile.ranger
index b3b75c5..b11e726 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger
+++ b/dev-support/ranger-docker/Dockerfile.ranger
@@ -17,14 +17,17 @@
 FROM ranger-base:latest
 
 ARG RANGER_VERSION
+ARG RANGER_DB_TYPE
 
 COPY ./dist/version                               /home/ranger/dist/
 COPY ./dist/ranger-${RANGER_VERSION}-admin.tar.gz /home/ranger/dist/
 COPY ./downloads/postgresql-42.2.16.jre7.jar      /home/ranger/dist/
+COPY ./downloads/mysql-connector-java-8.0.28.jar  /home/ranger/dist/
+COPY ./downloads/log4jdbc-1.2.jar                 /home/ranger/dist/
 
-COPY ./scripts/ranger.sh                         ${RANGER_SCRIPTS}/
-COPY ./scripts/ranger-admin-install.properties   ${RANGER_SCRIPTS}/
-COPY ./scripts/create-ranger-services.py         ${RANGER_SCRIPTS}/
+COPY ./scripts/ranger.sh                                         ${RANGER_SCRIPTS}/
+COPY ./scripts/ranger-admin-install-${RANGER_DB_TYPE}.properties ${RANGER_SCRIPTS}/ranger-admin-install.properties
+COPY ./scripts/create-ranger-services.py                         ${RANGER_SCRIPTS}/
 
 RUN tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-admin.tar.gz --directory=${RANGER_HOME} && \
     ln -s ${RANGER_HOME}/ranger-${RANGER_VERSION}-admin ${RANGER_HOME}/admin && \
@@ -34,7 +37,9 @@ RUN tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-admin.tar.gz --directory
     mkdir -p /var/log/ranger && \
     chown -R ranger:ranger ${RANGER_HOME}/admin/ /var/run/ranger/ /var/log/ranger/ && \
     mkdir -p /usr/share/java/ && \
-    mv /home/ranger/dist/postgresql-42.2.16.jre7.jar /usr/share/java/postgresql.jar
+    mv /home/ranger/dist/postgresql-42.2.16.jre7.jar /usr/share/java/postgresql.jar && \
+    mv /home/ranger/dist/mysql-connector-java-8.0.28.jar /usr/share/java/mysql-connector.jar && \
+    mv /home/ranger/dist/log4jdbc-1.2.jar ${RANGER_HOME}/admin/ews/webapp/WEB-INF/lib/log4jdbc-1.2.jar
 
 USER ranger
 
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hive b/dev-support/ranger-docker/Dockerfile.ranger-hive
index 6a27f3a..31afe33 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hive
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hive
@@ -19,21 +19,24 @@ FROM ranger-base:latest
 ARG HIVE_VERSION
 ARG HIVE_HADOOP_VERSION
 ARG RANGER_VERSION
+ARG RANGER_DB_TYPE
 
 
 COPY ./dist/version                                     /home/ranger/dist/
 COPY ./dist/ranger-${RANGER_VERSION}-hive-plugin.tar.gz /home/ranger/dist/
 COPY ./downloads/apache-hive-${HIVE_VERSION}-bin.tar.gz /home/ranger/dist/
 COPY ./downloads/hadoop-${HIVE_HADOOP_VERSION}.tar.gz   /home/ranger/dist/
+COPY ./downloads/mysql-connector-java-8.0.28.jar        /home/ranger/dist
 
 COPY ./scripts/ranger-hive-setup.sh                     /home/ranger/scripts/
 COPY ./scripts/ranger-hive.sh                           /home/ranger/scripts/
 COPY ./scripts/ranger-hive-plugin-install.properties    /home/ranger/scripts/
-COPY ./scripts/hive-site.xml                            /home/ranger/scripts/
+COPY ./scripts/hive-site-${RANGER_DB_TYPE}.xml          /home/ranger/scripts/hive-site.xml
 
 RUN tar xvfz /home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz --directory=/opt/ && \
     ln -s /opt/apache-hive-${HIVE_VERSION}-bin /opt/hive && \
     rm -f /home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz && \
+    mv /home/ranger/dist/mysql-connector-java-8.0.28.jar /opt/hive/lib/ && \
     tar xvfz /home/ranger/dist/hadoop-${HIVE_HADOOP_VERSION}.tar.gz --directory=/opt/ && \
     ln -s /opt/hadoop-${HIVE_HADOOP_VERSION} /opt/hadoop && \
     rm -f /home/ranger/dist/hadoop-${HIVE_HADOOP_VERSION}.tar.gz && \
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-db b/dev-support/ranger-docker/Dockerfile.ranger-mysql
similarity index 69%
copy from dev-support/ranger-docker/Dockerfile.ranger-db
copy to dev-support/ranger-docker/Dockerfile.ranger-mysql
index f33e813..9ab3d46 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-db
+++ b/dev-support/ranger-docker/Dockerfile.ranger-mysql
@@ -14,11 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM postgres:12
+FROM mariadb:10.7.3
 
 # Copy DB init script
 USER 0
-RUN  mkdir -p /docker-entrypoint-initdb.d
-COPY config/init_postgres.sh /docker-entrypoint-initdb.d/
-RUN chown -R postgres:postgres /docker-entrypoint-initdb.d/
-ENV POSTGRES_PASSWORD rangerR0cks!
+
+RUN mkdir -p /docker-entrypoint-initdb.d /home/mysql
+COPY config/init_mysql.sql /docker-entrypoint-initdb.d/
+COPY config/my.cnf /home/mysql/.my.cnf
+RUN sed -i "s/skip-name-resolve/# skip-name-resolve/" /etc/mysql/mariadb.cnf
+RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/ /home/mysql
+
+ENV MYSQL_ROOT_PASSWORD rangerR0cks!
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-db b/dev-support/ranger-docker/Dockerfile.ranger-postgres
similarity index 100%
rename from dev-support/ranger-docker/Dockerfile.ranger-db
rename to dev-support/ranger-docker/Dockerfile.ranger-postgres
diff --git a/dev-support/ranger-docker/README.md b/dev-support/ranger-docker/README.md
index 02a5643..248ab1f 100644
--- a/dev-support/ranger-docker/README.md
+++ b/dev-support/ranger-docker/README.md
@@ -43,7 +43,10 @@ Docker files in this folder create docker images and run them to build Apache Ra
 
    5.2. Execute following command to start Ranger, Ranger enabled HDFS/YARN/HBase/Hive/Kafka/Knox and dependent services (Solr, DB) in containers:
 
-        docker-compose -f docker-compose.ranger-base.yml -f docker-compose.ranger.yml -f docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml -f docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hbase.yml -f docker-compose.ranger-kafka.yml -f docker-compose.ranger-hive.yml -f docker-compose.ranger-knox.yml up -d
+        export RANGER_DB_TYPE=postgres
+        docker-compose -f docker-compose.ranger-base.yml -f docker-compose.ranger.yml -f docker-compose.ranger-${RANGER_DB_TYPE}.yml -f docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml -f docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hbase.yml -f docker-compose.ranger-kafka.yml -f docker-compose.ranger-hive.yml -f docker-compose.ranger-knox.yml up -d
+
+	- valid values for RANGER_DB_TYPE: mysql or postgres
 
    5.3. To rebuild specific images and start containers with the new image, use following command:
 
diff --git a/dev-support/ranger-docker/scripts/ranger-hive-setup.sh b/dev-support/ranger-docker/config/init_mysql.sql
old mode 100755
new mode 100644
similarity index 50%
copy from dev-support/ranger-docker/scripts/ranger-hive-setup.sh
copy to dev-support/ranger-docker/config/init_mysql.sql
index 27b2323..fc4c1b4
--- a/dev-support/ranger-docker/scripts/ranger-hive-setup.sh
+++ b/dev-support/ranger-docker/config/init_mysql.sql
@@ -16,30 +16,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo "export JAVA_HOME=${JAVA_HOME}" >> ${HADOOP_HOME}/etc/hadoop/hadoop-env.sh
 
-cat <<EOF > /etc/ssh/ssh_config
-Host *
-   StrictHostKeyChecking no
-   UserKnownHostsFile=/dev/null
-EOF
+CREATE USER 'rangeradmin'@'%'         IDENTIFIED BY 'rangerR0cks!';
+CREATE USER 'rangeradmin'@'localhost' IDENTIFIED BY 'rangerR0cks!';
+CREATE USER 'rangeradmin'@'ranger-db' IDENTIFIED BY 'rangerR0cks!';
 
-cat <<EOF > ${HADOOP_HOME}/etc/hadoop/core-site.xml
-<configuration>
-  <property>
-    <name>fs.defaultFS</name>
-    <value>hdfs://ranger-hadoop:9000</value>
-  </property>
-</configuration>
-EOF
+CREATE DATABASE ranger;
+GRANT ALL PRIVILEGES ON ranger.* TO 'rangeradmin'@'%';
+GRANT ALL PRIVILEGES ON ranger.* TO 'rangeradmin'@'localhost';
+GRANT ALL PRIVILEGES ON ranger.* TO 'rangeradmin'@'ranger-db';
 
-cp ${RANGER_SCRIPTS}/hive-site.xml ${HIVE_HOME}/conf/hive-site.xml
-cp ${RANGER_SCRIPTS}/hive-site.xml ${HIVE_HOME}/conf/hiveserver2-site.xml
-su -c "${HIVE_HOME}/bin/schematool -dbType postgres -initSchema" hive
+CREATE USER 'hive'@'%'         IDENTIFIED BY 'rangerR0cks!';
+CREATE USER 'hive'@'localhost' IDENTIFIED BY 'rangerR0cks!';
+CREATE USER 'hive'@'ranger-db' IDENTIFIED BY 'rangerR0cks!';
 
-mkdir -p /opt/hive/logs
-chown -R hive:hadoop /opt/hive/
-chmod g+w /opt/hive/logs
+CREATE DATABASE hive;
+GRANT ALL PRIVILEGES ON hive.* TO 'hive'@'%';
+GRANT ALL PRIVILEGES ON hive.* TO 'hive'@'localhost';
+GRANT ALL PRIVILEGES ON hive.* TO 'hive'@'ranger-db';
 
-cd ${RANGER_HOME}/ranger-hive-plugin
-./enable-hive-plugin.sh
+FLUSH PRIVILEGES;
diff --git a/dev-support/ranger-docker/config/my.cnf b/dev-support/ranger-docker/config/my.cnf
new file mode 100644
index 0000000..77e958e
--- /dev/null
+++ b/dev-support/ranger-docker/config/my.cnf
@@ -0,0 +1,23 @@
+# The MariaDB configuration file
+#
+# The MariaDB/MySQL tools read configuration files in the following order:
+# 0. "/etc/mysql/my.cnf"
+# 1. "/etc/mysql/mariadb.cnf" to set global defaults,
+# 2. "/etc/mysql/conf.d/*.cnf" to set global options.
+# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
+# 4. "~/.my.cnf" (this file) to set user-specific options.
+#
+
+#
+# This group is read both by the client and the server
+# use it for options that affect everything
+#
+[client-server]
+
+# Import all .cnf files from configuration directory
+[mariadbd]
+collation-server = utf8_unicode_ci
+init-connect = 'SET NAMES utf8'
+character_set_server = utf8
+# transaction-isolation = REPEATABLE-READ
+# transaction-isolation = READ-COMMITTED
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hive.yml b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
index 4b7fdb6..f4b986a 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hive.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
@@ -8,6 +8,7 @@ services:
         - HIVE_HADOOP_VERSION=${HIVE_HADOOP_VERSION}
         - HIVE_VERSION=${HIVE_VERSION}
         - RANGER_VERSION=${RANGER_VERSION}
+        - RANGER_DB_TYPE=${RANGER_DB_TYPE}
     image: ranger-hive
     container_name: ranger-hive
     hostname: ranger-hive.example.com
@@ -28,6 +29,7 @@ services:
       - HIVE_HADOOP_VERSION
       - HIVE_VERSION
       - RANGER_VERSION
+      - RANGER_DB_TYPE
 
 networks:
   ranger:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-mysql.yml b/dev-support/ranger-docker/docker-compose.ranger-mysql.yml
new file mode 100644
index 0000000..9c353d6
--- /dev/null
+++ b/dev-support/ranger-docker/docker-compose.ranger-mysql.yml
@@ -0,0 +1,21 @@
+version: '3'
+services:
+  ranger-db:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-mysql
+    image: ranger-mysql
+    command: --default-authentication-plugin=mysql_native_password
+    container_name: ranger-mysql
+    hostname: ranger-db.example.com
+    networks:
+      - ranger
+    healthcheck:
+      test: ["CMD-SHELL", 'mysqladmin ping']
+      interval: 10s
+      timeout: 2s
+      retries: 30
+
+networks:
+  ranger:
+    name: rangernw
diff --git a/dev-support/ranger-docker/docker-compose.ranger-postgres.yml b/dev-support/ranger-docker/docker-compose.ranger-postgres.yml
new file mode 100644
index 0000000..997365f
--- /dev/null
+++ b/dev-support/ranger-docker/docker-compose.ranger-postgres.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+  ranger-db:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-postgres
+    image: ranger-postgres
+    container_name: ranger-postgres
+    hostname: ranger-db.example.com
+    networks:
+      - ranger
+    healthcheck:
+      test: ["CMD-SHELL", 'pg_isready -q']
+      interval: 10s
+      timeout: 2s
+      retries: 30
+
+networks:
+  ranger:
+    name: rangernw
diff --git a/dev-support/ranger-docker/docker-compose.ranger.yml b/dev-support/ranger-docker/docker-compose.ranger.yml
index 41e3891..c857e6b 100644
--- a/dev-support/ranger-docker/docker-compose.ranger.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger.yml
@@ -6,6 +6,7 @@ services:
       dockerfile: Dockerfile.ranger
       args:
         - RANGER_VERSION=${RANGER_VERSION}
+        - RANGER_DB_TYPE=${RANGER_DB_TYPE}
     image: ranger:latest
     container_name: ranger
     hostname: ranger.example.com
@@ -19,11 +20,12 @@ services:
       ranger-zk:
         condition: service_started
       ranger-db:
-        condition: service_started
+        condition: service_healthy
       ranger-solr:
         condition: service_started
     environment:
       - RANGER_VERSION
+      - RANGER_DB_TYPE
     command:
       - /home/ranger/scripts/ranger.sh
 
@@ -55,16 +57,6 @@ services:
       - ranger_audits
       - /opt/solr/server/solr/configsets/ranger_audits/
 
-  ranger-db:
-    build:
-      context: .
-      dockerfile: Dockerfile.ranger-db
-    image: ranger-db
-    container_name: ranger-db
-    hostname: ranger-db.example.com
-    networks:
-      - ranger
-
 networks:
   ranger:
     name: rangernw
diff --git a/dev-support/ranger-docker/download-archives.sh b/dev-support/ranger-docker/download-archives.sh
index e37cc0e..4b2736f 100755
--- a/dev-support/ranger-docker/download-archives.sh
+++ b/dev-support/ranger-docker/download-archives.sh
@@ -49,5 +49,8 @@ downloadIfNotPresent kafka_2.12-${KAFKA_VERSION}.tgz        https://archive.apac
 downloadIfNotPresent apache-hive-${HIVE_VERSION}-bin.tar.gz https://archive.apache.org/dist/hive/hive-${HIVE_VERSION}
 downloadIfNotPresent hadoop-${HIVE_HADOOP_VERSION}.tar.gz   https://archive.apache.org/dist/hadoop/common/hadoop-${HIVE_HADOOP_VERSION}
 downloadIfNotPresent postgresql-42.2.16.jre7.jar            https://search.maven.org/remotecontent?filepath=org/postgresql/postgresql/42.2.16.jre7
+downloadIfNotPresent mysql-connector-java-8.0.28.jar        https://search.maven.org/remotecontent?filepath=mysql/mysql-connector-java/8.0.28
+downloadIfNotPresent log4jdbc-1.2.jar                       https://repo1.maven.org/maven2/com/googlecode/log4jdbc/log4jdbc/1.2
+
 downloadIfNotPresent knox-${KNOX_VERSION}.tar.gz            https://archive.apache.org/dist/knox/${KNOX_VERSION}
 
diff --git a/dev-support/ranger-docker/scripts/hive-site.xml b/dev-support/ranger-docker/scripts/hive-site-mysql.xml
similarity index 94%
copy from dev-support/ranger-docker/scripts/hive-site.xml
copy to dev-support/ranger-docker/scripts/hive-site-mysql.xml
index 55343a3..118cdbb 100644
--- a/dev-support/ranger-docker/scripts/hive-site.xml
+++ b/dev-support/ranger-docker/scripts/hive-site-mysql.xml
@@ -21,11 +21,11 @@
 <configuration>
     <property>
         <name>javax.jdo.option.ConnectionURL</name>
-        <value>jdbc:postgresql://ranger-db/hive</value>
+        <value>jdbc:mysql://ranger-db/hive</value>
     </property>
     <property>
         <name>javax.jdo.option.ConnectionDriverName</name>
-        <value>org.postgresql.Driver</value>
+        <value>com.mysql.jdbc.Driver</value>
     </property>
     <property>
         <name>javax.jdo.option.ConnectionUserName</name>
diff --git a/dev-support/ranger-docker/scripts/hive-site.xml b/dev-support/ranger-docker/scripts/hive-site-postgres.xml
similarity index 100%
rename from dev-support/ranger-docker/scripts/hive-site.xml
rename to dev-support/ranger-docker/scripts/hive-site-postgres.xml
diff --git a/dev-support/ranger-docker/scripts/ranger-admin-install.properties b/dev-support/ranger-docker/scripts/ranger-admin-install-mysql.properties
similarity index 92%
copy from dev-support/ranger-docker/scripts/ranger-admin-install.properties
copy to dev-support/ranger-docker/scripts/ranger-admin-install-mysql.properties
index b9fefc5..5a696e4 100644
--- a/dev-support/ranger-docker/scripts/ranger-admin-install.properties
+++ b/dev-support/ranger-docker/scripts/ranger-admin-install-mysql.properties
@@ -20,11 +20,11 @@
 PYTHON_COMMAND_INVOKER=python3
 RANGER_ADMIN_LOG_DIR=/var/log/ranger
 RANGER_PID_DIR_PATH=/var/run/ranger
-DB_FLAVOR=POSTGRES
-SQL_CONNECTOR_JAR=/usr/share/java/postgresql.jar
+DB_FLAVOR=MYSQL
+SQL_CONNECTOR_JAR=/usr/share/java/mysql-connector.jar
 RANGER_ADMIN_LOGBACK_CONF_FILE=/opt/ranger/admin/ews/webapp/WEB-INF/classes/conf/logback.xml
 
-db_root_user=postgres
+db_root_user=root
 db_root_password=rangerR0cks!
 db_host=ranger-db
 
@@ -34,6 +34,8 @@ db_password=rangerR0cks!
 
 postgres_core_file=db/postgres/optimized/current/ranger_core_db_postgres.sql
 postgres_audit_file=db/postgres/xa_audit_db_postgres.sql
+mysql_core_file=db/mysql/optimized/current/ranger_core_db_mysql.sql
+mysql_audit_file=db/mysql/xa_audit_db.sql
 
 rangerAdmin_password=rangerR0cks!
 rangerTagsync_password=rangerR0cks!
@@ -53,7 +55,6 @@ unix_user_pwd=ranger
 unix_group=ranger
 
 # Following variables are referenced in db_setup.py. Do not remove these
-mysql_core_file=
 oracle_core_file=
 sqlserver_core_file=
 sqlanywhere_core_file=
diff --git a/dev-support/ranger-docker/scripts/ranger-admin-install.properties b/dev-support/ranger-docker/scripts/ranger-admin-install-postgres.properties
similarity index 95%
rename from dev-support/ranger-docker/scripts/ranger-admin-install.properties
rename to dev-support/ranger-docker/scripts/ranger-admin-install-postgres.properties
index b9fefc5..656430b 100644
--- a/dev-support/ranger-docker/scripts/ranger-admin-install.properties
+++ b/dev-support/ranger-docker/scripts/ranger-admin-install-postgres.properties
@@ -34,6 +34,8 @@ db_password=rangerR0cks!
 
 postgres_core_file=db/postgres/optimized/current/ranger_core_db_postgres.sql
 postgres_audit_file=db/postgres/xa_audit_db_postgres.sql
+mysql_core_file=db/mysql/optimized/current/ranger_core_db_mysql.sql
+mysql_audit_file=db/mysql/xa_audit_db.sql
 
 rangerAdmin_password=rangerR0cks!
 rangerTagsync_password=rangerR0cks!
@@ -53,7 +55,6 @@ unix_user_pwd=ranger
 unix_group=ranger
 
 # Following variables are referenced in db_setup.py. Do not remove these
-mysql_core_file=
 oracle_core_file=
 sqlserver_core_file=
 sqlanywhere_core_file=
diff --git a/dev-support/ranger-docker/scripts/ranger-hive-setup.sh b/dev-support/ranger-docker/scripts/ranger-hive-setup.sh
index 27b2323..c0e7ee4 100755
--- a/dev-support/ranger-docker/scripts/ranger-hive-setup.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hive-setup.sh
@@ -35,7 +35,7 @@ EOF
 
 cp ${RANGER_SCRIPTS}/hive-site.xml ${HIVE_HOME}/conf/hive-site.xml
 cp ${RANGER_SCRIPTS}/hive-site.xml ${HIVE_HOME}/conf/hiveserver2-site.xml
-su -c "${HIVE_HOME}/bin/schematool -dbType postgres -initSchema" hive
+su -c "${HIVE_HOME}/bin/schematool -dbType ${RANGER_DB_TYPE} -initSchema" hive
 
 mkdir -p /opt/hive/logs
 chown -R hive:hadoop /opt/hive/