RANGER-5386: addressed review suggestions

Author: mneethiraj

dev-support/ranger-docker/.env

@@ -67,7 +67,6 @@ OZONE_RUNNER_VERSION=20230615-1
 
 # Trino Configuration
 TRINO_VERSION=latest
-TRINO_PLUGIN_VERSION=3.0.0-SNAPSHOT
 
 # Debug Configuration
 DEBUG_ADMIN=false

dev-support/ranger-docker/Dockerfile.ranger-trino

@@ -17,35 +17,6 @@
 ARG TRINO_VERSION
 FROM trinodb/trino:${TRINO_VERSION}
 
-# trino base image layer has undergone changes in base os image with time.
-##########################################
-#   Trino Versions  |      OS Layer      #
-#    359 - 369      |     centos 11      #
-#    370 - 389      |       ubi8         #
-#    390 - 391      |    azul openjdk    #
-#       392         |       ubi8         #
-#    393 - 431      |   eclipse-temurin  #
-#    432 - current  |       ubi9         #
-##########################################
-
-USER root
-
-ARG TRINO_VERSION
-ARG TRINO_PLUGIN_VERSION
-
-RUN mkdir -p /home/ranger/scripts/
-
-COPY ./scripts/access-control.properties    /etc/trino/
-COPY ./scripts/ranger-trino-audit.xml       /etc/trino/
-COPY ./scripts/ranger-trino-security.xml    /etc/trino/
-COPY ./scripts/core-site.xml                /etc/trino/
-COPY ./scripts/ranger-trino-hive.properties /etc/trino/catalog/hive.properties
-
-COPY ./scripts/ranger-trino.sh                /home/ranger/scripts/
-COPY ./scripts/ranger-trino-setup.sh          /home/ranger/scripts/
-
-RUN chmod 744 /home/ranger/scripts/ranger-trino-setup.sh /home/ranger/scripts/ranger-trino.sh
-
 USER trino
 
-ENTRYPOINT ["/home/ranger/scripts/ranger-trino.sh"]
+COPY ./config/trino/*  /etc/trino/

dev-support/ranger-docker/scripts/access-control.properties renamed to dev-support/ranger-docker/config/trino/access-control.properties

@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude">
+	<!--  The following properties are used for 2-way SSL client server validation -->
+	<property>
+		<name>xasecure.policymgr.clientssl.keystore</name>
+		<value>hadoopdev-clientcert.jks</value>
+		<description> 
+			Java Keystore files 
+		</description>
+	</property>
+	<property>
+		<name>xasecure.policymgr.clientssl.truststore</name>
+		<value>cacerts-xasecure.jks</value>
+		<description> 
+			java truststore file
+		</description>
+	</property>
+    <property>
+		<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
+		<value>jceks://file/tmp/keystore-hadoopdev-ssl.jceks</value>
+		<description> 
+			java  keystore credential file
+		</description>
+	</property>
+	<property>
+		<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
+		<value>jceks://file/tmp/truststore-hadoopdev-ssl.jceks</value>
+		<description> 
+			java  truststore credential file
+		</description>
+	</property>
+</configuration>

dev-support/ranger-docker/scripts/ranger-trino-hive.properties renamed to dev-support/ranger-docker/config/trino/catalog/hive.properties

@@ -4,7 +4,6 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-trino
       args:
-        - TRINO_PLUGIN_VERSION=${TRINO_PLUGIN_VERSION}
         - TRINO_VERSION=${TRINO_VERSION}
     image: ranger-trino
     hostname: trino
@@ -19,7 +18,6 @@ services:
       ranger:
         condition: service_started
     environment:
-      - TRINO_PLUGIN_VERSION
       - TRINO_VERSION
 
 networks: