This is an automated email from the ASF dual-hosted git repository. sneethir 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 29d4c7ec7 RANGER-4229:Add flag based support for mounting db volume in dev-support scripts 29d4c7ec7 is described below commit 29d4c7ec743db2d6c84f1303e29b06a4009c33a8 Author: Mohit_Ambalkar <mohit.ambal...@privacera.com> AuthorDate: Wed May 17 15:54:13 2023 +0530 RANGER-4229:Add flag based support for mounting db volume in dev-support scripts Signed-off-by: Selvamohan Neethiraj <sneet...@apache.org> --- dev-support/ranger-docker/.env | 2 +- .../docker-compose.ranger-postgres-mounted.yml | 23 ++++++++++++++++++ ranger_in_docker | 28 +++++++++++++++------- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env index 3f795abde..4ec143add 100644 --- a/dev-support/ranger-docker/.env +++ b/dev-support/ranger-docker/.env @@ -21,9 +21,9 @@ RANGER_ADMIN_JAVA_VERSION=8 UBUNTU_VERSION=20.04 MARIADB_VERSION=10.7.3 POSTGRES_VERSION=12 +ENABLE_DB_MOUNT=true ZK_VERSION=3.5.9 SOLR_VERSION=8 - RANGER_VERSION=3.0.0-SNAPSHOT HADOOP_VERSION=3.3.0 HBASE_VERSION=2.4.6 diff --git a/dev-support/ranger-docker/docker-compose.ranger-postgres-mounted.yml b/dev-support/ranger-docker/docker-compose.ranger-postgres-mounted.yml new file mode 100644 index 000000000..e38510af1 --- /dev/null +++ b/dev-support/ranger-docker/docker-compose.ranger-postgres-mounted.yml @@ -0,0 +1,23 @@ +version: '3' +services: + ranger-db: + build: + context: . + dockerfile: Dockerfile.ranger-postgres + args: + - POSTGRES_VERSION=${POSTGRES_VERSION} + image: ranger-postgres + container_name: ranger-postgres + hostname: ranger-db.example.com + networks: + - ranger + volumes: + - ./postgres-db-mount:/var/lib/postgresql/data + healthcheck: + test: 'su -c "pg_isready -q" postgres' + interval: 10s + timeout: 2s + retries: 30 +networks: + ranger: + name: rangernw diff --git a/ranger_in_docker b/ranger_in_docker index 2057bde3e..99089f878 100755 --- a/ranger_in_docker +++ b/ranger_in_docker @@ -44,12 +44,31 @@ # List of optional services: # tagsync,hadoop,hbase,kafka,hive,knox,kms # +if [ -z "${RANGER_HOME}" ] +then + rhd=`dirname $0` + RANGER_HOME=$(cd ${rhd}; pwd) +fi +RD_HOME=${RANGER_HOME}/dev-support/ranger-docker + +ENV_FILE=${RD_HOME}/.env + +source "${ENV_FILE}" ENABLED_RANGER_SERVICE_FILE=${HOME}/.ranger_docker_services [ -z "${RANGER_DB_TYPE}" ] && RANGER_DB_TYPE="postgres" -CORE_SERVICES="ranger-base,ranger,ranger-${RANGER_DB_TYPE},ranger-usersync" + export ENABLE_DB_MOUNT + +if [ "${ENABLE_DB_MOUNT}" = "true" ]; +then + DB_SERVICE_NAME="ranger-${RANGER_DB_TYPE}-mounted" +else + DB_SERVICE_NAME="ranger-${RANGER_DB_TYPE}" +fi + +CORE_SERVICES="ranger-base,ranger,${DB_SERVICE_NAME},ranger-usersync" if [ -z "${ENABLED_RANGER_SERVICES}" ] then @@ -61,11 +80,6 @@ else echo "${ENABLED_RANGER_SERVICES}" > ${ENABLED_RANGER_SERVICE_FILE} fi -if [ -z "${RANGER_HOME}" ] -then - rhd=`dirname $0` - RANGER_HOME=$(cd ${rhd}; pwd) -fi if [ ! -d "${RANGER_HOME}" ] then @@ -73,7 +87,6 @@ then exit 1 fi -RD_HOME=${RANGER_HOME}/dev-support/ranger-docker export RD_HOME cd ${RD_HOME} @@ -133,7 +146,6 @@ then DOCKER_MAVEN_BUILD=0 fi -ENV_FILE=${RD_HOME}/.env export RANGER_DB_TYPE cd ${RANGER_HOME}