diff --git a/docker/datahub-gms/start.sh b/docker/datahub-gms/start.sh index cc4b42c4ed..474eef5276 100755 --- a/docker/datahub-gms/start.sh +++ b/docker/datahub-gms/start.sh @@ -53,10 +53,15 @@ if [[ $ENABLE_PROMETHEUS == true ]]; then PROMETHEUS_AGENT="-javaagent:jmx_prometheus_javaagent.jar=4318:/datahub/datahub-gms/scripts/prometheus-config.yaml " fi -# for container based deployments the default directory is /etc/datahub/plugins/auth/resources and it can be different for +# For container based deployments the default directory is /etc/datahub/plugins/auth/resources and it can be different for # kubernetes deployments auth_resource_dir=${AUTH_RESOURCES_DIR:-"/etc/datahub/plugins/auth/resources"} # Option --classes ${AUTH_RESOURCE_LOOK_UP_DIR} is added for Apache Ranger library to load the ranger-datahub-security.xml from classpath +CLASSES_DIR="" +if [[ ${RANGER_AUTHORIZER_ENABLED} == true ]]; then + CLASSES_DIR="--classes ${auth_resource_dir}" +fi + COMMON=" $WAIT_FOR_EBEAN \ $WAIT_FOR_CASSANDRA \ @@ -68,7 +73,7 @@ COMMON=" $PROMETHEUS_AGENT \ -jar /jetty-runner.jar \ --jar jetty-util.jar \ - --jar jetty-jmx.jar --classes ${auth_resource_dir} \ + --jar jetty-jmx.jar ${CLASSES_DIR} \ --config /datahub/datahub-gms/scripts/jetty.xml \ /datahub/datahub-gms/bin/war.war" diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml index 1ccd71c74f..8aa33e5f88 100644 --- a/docker/docker-compose-without-neo4j.override.yml +++ b/docker/docker-compose-without-neo4j.override.yml @@ -33,7 +33,6 @@ services: - mysql volumes: - ${HOME}/.datahub/plugins:/etc/datahub/plugins - - ${HOME}/.datahub/plugins/auth/resources/:/etc/datahub/plugins/auth/resources volumes: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 7e3c056679..e8b11c4e95 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -48,7 +48,6 @@ services: - ../metadata-models/src/main/resources/:/datahub/datahub-gms/resources - ../metadata-service/war/build/libs/:/datahub/datahub-gms/bin - ${HOME}/.datahub/plugins:/etc/datahub/plugins - - ${HOME}/.datahub/plugins/auth/resources/:/etc/datahub/plugins/auth/resources datahub-frontend-react: image: linkedin/datahub-frontend-react:debug diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml index 82eb2157b5..40dad574ff 100644 --- a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml +++ b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml @@ -86,7 +86,6 @@ services: - ${DATAHUB_MAPPED_GMS_PORT:-8080}:8080 volumes: - ${HOME}/.datahub/plugins:/etc/datahub/plugins - - ${HOME}/.datahub/plugins/auth/resources/:/etc/datahub/plugins/auth/resources elasticsearch: container_name: elasticsearch environment: diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml index 98448769f5..d1a65b0140 100644 --- a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml +++ b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml @@ -90,7 +90,6 @@ services: - 8080:8080 volumes: - ${HOME}/.datahub/plugins:/etc/datahub/plugins - - ${HOME}/.datahub/plugins/auth/resources/:/etc/datahub/plugins/auth/resources elasticsearch: container_name: elasticsearch environment: