AMBARI-22334. Remove python & npm install from Log Search docker container (Krisztian Kasa via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fde9d79 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fde9d79 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fde9d79 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 9fde9d79fcfd7f4d4c0b6068f0cb07fbe17c1cc4 Parents: 6b7a7a7 Author: Krisztian Kasa <[email protected]> Authored: Mon Oct 30 17:02:51 2017 +0100 Committer: Oliver Szabo <[email protected]> Committed: Mon Oct 30 17:03:09 2017 +0100 ---------------------------------------------------------------------- ambari-logsearch/docker/Dockerfile | 6 ------ ambari-logsearch/docker/docker-compose.yml | 4 ++-- ambari-logsearch/docker/logsearch-docker.sh | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9fde9d79/ambari-logsearch/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/Dockerfile b/ambari-logsearch/docker/Dockerfile index 70e80b6..e79f61b 100644 --- a/ambari-logsearch/docker/Dockerfile +++ b/ambari-logsearch/docker/Dockerfile @@ -53,12 +53,6 @@ RUN echo 'X11DisplayOffset 10\n' /etc/ssh/sshd_config #To allow bower install behind proxy. See https://github.com/bower/bower/issues/731 RUN git config --global url."https://".insteadOf git:// -# Install python, nodejs and npm -RUN yum -y install http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm -RUN yum -y install nodejs npm --enablerepo=epel -RUN npm install -g [email protected] -RUN npm install -g [email protected] - # Install Solr ENV SOLR_VERSION 6.6.2 RUN wget --no-check-certificate -O /root/solr-$SOLR_VERSION.tgz http://public-repo-1.hortonworks.com/ARTIFACTS/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz http://git-wip-us.apache.org/repos/asf/ambari/blob/9fde9d79/ambari-logsearch/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/docker-compose.yml b/ambari-logsearch/docker/docker-compose.yml index a6eeb0d..725af36 100644 --- a/ambari-logsearch/docker/docker-compose.yml +++ b/ambari-logsearch/docker/docker-compose.yml @@ -30,7 +30,7 @@ services: restart: always hostname: solr ports: - - "8886:8983" + - "8983:8983" networks: - logsearch-network env_file: @@ -86,4 +86,4 @@ services: - $AMBARI_LOCATION/ambari-logsearch/ambari-logsearch-logfeeder/target/classes:/root/ambari/ambari-logsearch/ambari-logsearch-logfeeder/target/package/classes networks: logsearch-network: - driver: bridge \ No newline at end of file + driver: bridge http://git-wip-us.apache.org/repos/asf/ambari/blob/9fde9d79/ambari-logsearch/docker/logsearch-docker.sh ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/logsearch-docker.sh b/ambari-logsearch/docker/logsearch-docker.sh index b44e7ee..2a929b7 100755 --- a/ambari-logsearch/docker/logsearch-docker.sh +++ b/ambari-logsearch/docker/logsearch-docker.sh @@ -83,6 +83,7 @@ LOGSEARCH_DEBUG_SUSPEND=n LOGSEARCH_HTTPS_ENABLED=false LOGSEARCH_SOLR_SSL_ENABLED=false GENERATE_KEYSTORE_AT_START=false +SOLR_HOST=solr EOF echo "'Profile' file has been created. Check it out before starting Log Search. ($sdir/Profile)" exit
