kumaab commented on code in PR #920:
URL: https://github.com/apache/ranger/pull/920#discussion_r3174880457


##########
dev-support/ranger-docker/Dockerfile.ranger:
##########
@@ -25,36 +25,66 @@ ARG TARGETARCH
 
 COPY ./dist/ranger-${RANGER_VERSION}-admin.tar.gz     /home/ranger/dist/
 COPY ./scripts/admin/ranger.sh                        ${RANGER_SCRIPTS}/
-COPY ./scripts/admin/create-ranger-services.py        ${RANGER_SCRIPTS}/
+COPY ./scripts/admin/user_password_bootstrap.py       ${RANGER_SCRIPTS}/
+COPY ./scripts/python/log_config.py                   ${RANGER_SCRIPTS}/
+COPY ./scripts/admin/dba.py                           ${RANGER_SCRIPTS}/
+COPY ./scripts/admin/ranger_admin_xml_config.py       ${RANGER_SCRIPTS}/
+COPY ./scripts/admin/create-ranger-services.py        
${RANGER_SCRIPTS}/create_services.py
 
 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 \
     && rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-admin.tar.gz \
     && rm -f /opt/ranger/admin/install.properties \
+    && rm -f /opt/ranger/admin/setup.sh \
+    && rm -f /opt/ranger/admin/dba_script.py \
+    && rm -f /opt/ranger/admin/db_setup.py \
     && mkdir -p /var/run/ranger /var/log/ranger /usr/share/java/ \
+    && mkdir -p ${RANGER_HOME}/admin/ews/webapp/WEB-INF/classes/conf \
+    && rm -rf ${RANGER_HOME}/admin/ews/logs \
+    && ln -s /var/log/ranger ${RANGER_HOME}/admin/ews/logs \
     && chown -R ranger:ranger ${RANGER_HOME}/admin/ ${RANGER_SCRIPTS}/ 
/var/run/ranger/ /var/log/ranger/ \
     && chmod 755 ${RANGER_SCRIPTS}/ranger.sh
 
+# Copy config files
+COPY ./scripts/admin/configs/logback.xml                     
${RANGER_HOME}/admin/ews/webapp/WEB-INF/classes/conf
+COPY ./scripts/admin/configs/security-applicationContext.xml 
${RANGER_HOME}/admin/ews/webapp/WEB-INF/classes/conf
+
 FROM ranger AS ranger_postgres
 COPY ./downloads/postgresql-42.2.16.jre7.jar         /home/ranger/dist/
-RUN mv /home/ranger/dist/postgresql-42.2.16.jre7.jar 
/usr/share/java/postgresql.jar
+RUN mv /home/ranger/dist/postgresql-42.2.16.jre7.jar 
/usr/share/java/postgresql.jar &&\
+    chown ranger:ranger /usr/share/java/postgresql.jar
+ENV SQL_CONNECTOR_JAR=/usr/share/java/postgresql.jar
+ENV DB_FLAVOR=POSTGRES
 
 FROM ranger AS ranger_mysql
 COPY ./downloads/mysql-connector-java-8.0.28.jar  /home/ranger/dist/
 COPY ./downloads/log4jdbc-1.2.jar                 /home/ranger/dist/
 RUN     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
+ENV SQL_CONNECTOR_JAR=/usr/share/java/mysql-connector.jar
+ENV DB_FLAVOR=MYSQL
 
 FROM ranger AS ranger_oracle
 COPY ./downloads/ojdbc8.jar         /home/ranger/dist/
 RUN mv /home/ranger/dist/ojdbc8.jar /usr/share/java/oracle.jar
+ENV SQL_CONNECTOR_JAR=/usr/share/java/oracle.jar
+ENV DB_FLAVOR=ORACLE

Review Comment:
   re-factored to take a different approach. thanks.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to