RANGER-5167: Merge all database compose files and use extends

.github/workflows/maven.yml

@@ -130,7 +130,6 @@ jobs:
           export COMPOSE_DOCKER_CLI_BUILD=1
           export RANGER_DB_TYPE=postgres
           docker compose \
-          -f docker-compose.ranger-${RANGER_DB_TYPE}.yml \
           -f docker-compose.ranger.yml \
           -f docker-compose.ranger-usersync.yml \
           -f docker-compose.ranger-tagsync.yml \
@@ -148,7 +147,6 @@ jobs:
           ./scripts/ozone-plugin-docker-setup.sh
           export RANGER_DB_TYPE=postgres
           docker compose \
-          -f docker-compose.ranger-${RANGER_DB_TYPE}.yml \
           -f docker-compose.ranger.yml \
           -f docker-compose.ranger-usersync.yml \
           -f docker-compose.ranger-tagsync.yml \

dev-support/ranger-docker/README.md

@@ -81,9 +81,9 @@ docker-compose -f docker-compose.ranger-base-ubi.yml build --no-cache
 # To enable file based sync source for usersync do:
 # export ENABLE_FILE_SYNC_SOURCE=true
 
-# valid values for RANGER_DB_TYPE: mysql/postgres/oracle
+# valid values for RANGER_DB_TYPE: mysql/postgres/oracle/sqlserver
 
-docker-compose -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 up -d
+docker-compose -f docker-compose.ranger.yml -f docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml up -d
 
 # Ranger Admin can be accessed at http://localhost:6080 (admin/rangerR0cks!)
 ~~~

dev-support/ranger-docker/docker-compose.ranger-db-mounted.yml

@@ -0,0 +1,11 @@
+services:
+  ranger-db:
+    extends:
+      service: ${RANGER_DB_TYPE}
+      file: docker-compose.ranger-db.yml
+    volumes:
+      - ./postgres-db-mount:/var/lib/postgresql/data
+
+networks:
+  ranger:
+    name: rangernw

dev-support/ranger-docker/docker-compose.ranger-db.yml

@@ -0,0 +1,86 @@
+services:
+  postgres:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-postgres
+      args:
+        - POSTGRES_VERSION=${POSTGRES_VERSION}
+    image: ranger-postgres
+    container_name: ranger-postgres
+    hostname: ranger-db.example.com
+    ports:
+      - "5432:5432"
+    networks:
+      - ranger
+    healthcheck:
+      test: 'su -c "pg_isready -q" postgres'
+      interval: 10s
+      timeout: 2s
+      retries: 30
+
+  mysql:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-mysql
+      args:
+        - MARIADB_VERSION=${MARIADB_VERSION}
+    image: ranger-mysql
+    command: --default-authentication-plugin=mysql_native_password
+    container_name: ranger-mysql
+    hostname: ranger-db.example.com
+    ports:
+      - "3306:3306"
+    networks:
+      - ranger
+    healthcheck:
+      # Double dollar($$) is required to expand the env variable
+      test: "mysql -u root -p$$MYSQL_ROOT_PASSWORD ranger -e 'select 1' > /dev/null"
+      interval: 10s
+      timeout: 2s
+      retries: 30
+
+  oracle:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-oracle
+      args:
+        - ORACLE_VERSION=${ORACLE_VERSION}
+    image: ranger-oracle
+    container_name: ranger-oracle
+    hostname: ranger-db.example.com
+    ports:
+      - "1521:1521"
+    networks:
+      - ranger
+    healthcheck:
+      test: ["CMD", "healthcheck.sh"]
+      interval: 10s
+      timeout: 2s
+      retries: 30
+
+  sqlserver:
+    build:
+      context: .
+      dockerfile: Dockerfile.ranger-sqlserver
+      args:
+        - SQLSERVER_VERSION=${SQLSERVER_VERSION}
+    image: ranger-sqlserver
+    container_name: ranger-sqlserver
+    hostname: ranger-db.example.com
+    ports:
+      - "1433:1433"
+    networks:
+      - ranger
+    healthcheck:
+      test: [
+        "CMD-SHELL",
+        "/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P rangerR0cks! -Q \"SELECT 1\" -C" # -C bypasses SSL validation
+      ]
+      interval: 15s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+networks:
+  ranger:
+    name: rangernw

dev-support/ranger-docker/docker-compose.ranger.yml

@@ -30,6 +30,11 @@ services:
     command:
       - /home/ranger/scripts/ranger.sh
 
+  ranger-db:
+    extends:
+      service: ${RANGER_DB_TYPE}
+      file: docker-compose.ranger-db.yml
+
   ranger-zk:
     build:
       context: .

ranger_in_docker

@@ -61,15 +61,12 @@ ENABLED_RANGER_SERVICE_FILE=${HOME}/.ranger_docker_services
 
    export ENABLE_DB_MOUNT
 
+CORE_SERVICES="ranger-base,ranger,ranger-usersync"
 if [ "${ENABLE_DB_MOUNT}" = "true" ];
 then
-    DB_SERVICE_NAME="ranger-${RANGER_DB_TYPE}-mounted"
-else
-    DB_SERVICE_NAME="ranger-${RANGER_DB_TYPE}"
+    CORE_SERVICES="ranger-base,ranger,ranger-db-mounted,ranger-usersync"
 fi
 
-CORE_SERVICES="ranger-base,ranger,${DB_SERVICE_NAME},ranger-usersync"
-
 if [ -z "${ENABLED_RANGER_SERVICES}" ]
 then
     if [ -f ${ENABLED_RANGER_SERVICE_FILE} ]