[ambari] branch trunk updated: AMBARI-23097. Upgrade KNOX version to 1.0.0 for Log Search docker dev env

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new de78779  AMBARI-23097. Upgrade KNOX version to 1.0.0 for Log Search docker dev env
de78779 is described below

commit de78779996b6f3fe4222abdc3a4d345845f44b88
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Sun May 13 21:05:20 2018 +0200

    AMBARI-23097. Upgrade KNOX version to 1.0.0 for Log Search docker dev env
---
 ambari-logsearch/docker/Dockerfile                       | 2 +-
 ambari-logsearch/docker/knox/logsearch/1.0.0/service.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ambari-logsearch/docker/Dockerfile b/ambari-logsearch/docker/Dockerfile
index d4a4b1d..3a15c0b 100644
--- a/ambari-logsearch/docker/Dockerfile
+++ b/ambari-logsearch/docker/Dockerfile
@@ -61,7 +61,7 @@ RUN cd /root && tar -zxvf /root/solr-$SOLR_VERSION.tgz
 # Install Knox
 WORKDIR /
 RUN adduser knox
-ENV KNOX_VERSION 0.14.0
+ENV KNOX_VERSION 1.0.0
 RUN wget -q -O /knox-${KNOX_VERSION}.zip http://download.nextag.com/apache/knox/${KNOX_VERSION}/knox-${KNOX_VERSION}.zip && unzip /knox-${KNOX_VERSION}.zip && rm knox-${KNOX_VERSION}.zip && ln -nsf knox-${KNOX_VERSION} knox && chmod +x /knox/bin/*.sh && chown -R knox /knox/
 
 ADD knox/keystores /knox-secrets
diff --git a/ambari-logsearch/docker/knox/logsearch/1.0.0/service.xml b/ambari-logsearch/docker/knox/logsearch/1.0.0/service.xml
index 566092e..ad2eacb 100644
--- a/ambari-logsearch/docker/knox/logsearch/1.0.0/service.xml
+++ b/ambari-logsearch/docker/knox/logsearch/1.0.0/service.xml
@@ -16,6 +16,7 @@
   limitations under the License.
 -->
 <service role="LOGSEARCH" name="logsearch" version="1.0.0">
+  
   <routes>
 
     <route path="/logsearch">
@@ -35,6 +36,6 @@
 
   </routes>
 
-  <dispatch classname="org.apache.hadoop.gateway.dispatch.PassAllHeadersDispatch"/>
+  <dispatch classname="org.apache.knox.gateway.dispatch.PassAllHeadersDispatch"/>
 
 </service>

-- 
To stop receiving notification emails like this one, please contact
oleewere@apache.org.