allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [08/26] allura git commit: [#7806] ticket:773 Add solr container
Date Mon, 15 Jun 2015 14:22:57 GMT
[#7806] ticket:773 Add solr container


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/03296bff
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/03296bff
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/03296bff

Branch: refs/heads/hs/7885
Commit: 03296bffe61737e166a9555fc7d725e50b41f076
Parents: 5e297da
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu May 21 19:18:41 2015 +0300
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jun 12 11:43:31 2015 -0400

----------------------------------------------------------------------
 Allura/docker-dev.ini  |  2 +-
 docker-compose.yml     | 11 +++++++++++
 solr_config/Dockerfile | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/03296bff/Allura/docker-dev.ini
----------------------------------------------------------------------
diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini
index f33f264..34cb040 100644
--- a/Allura/docker-dev.ini
+++ b/Allura/docker-dev.ini
@@ -37,7 +37,7 @@ scm.host.rw.hg = /allura-data/scm/srv/hg$path
 scm.host.ro.svn = file:///allura-data/scm/svn$path/
 scm.host.rw.svn = file:///allura-data/scm/svn$path/
 
-;solr.server = http://solr:8983/solr
+solr.server = http://solr:8983/solr
 
 ;forgemail.host = smtp
 ;forgemail.port = 8825

http://git-wip-us.apache.org/repos/asf/allura/blob/03296bff/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 853c0de..38b3764 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ web:
     - /allura-data/scm/svn:/allura-data/scm/svn
   links:
     - mongo
+    - solr
 
 taskd:
   image: allura_web
@@ -24,6 +25,16 @@ taskd:
     - /allura-data/scm/svn:/allura-data/scm/svn
   links:
     - mongo
+    - solr
+
+solr:
+  build: solr_config
+  working_dir: /solr/solr-4.2.1/example
+  command: java -jar start.jar
+  ports:
+    - "8983:8983"
+  volumes:
+    - /allura-data/solr:/solr/solr-4.2.1/example/solr/collection1/data
 
 mongo:
   image: mongo:2.6

http://git-wip-us.apache.org/repos/asf/allura/blob/03296bff/solr_config/Dockerfile
----------------------------------------------------------------------
diff --git a/solr_config/Dockerfile b/solr_config/Dockerfile
new file mode 100644
index 0000000..27876e5
--- /dev/null
+++ b/solr_config/Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:12.04
+
+RUN apt-get update && apt-get install -y \
+    default-jre-headless \
+    wget \
+    tar
+
+ENV basedir /solr
+
+ADD . ${basedir}
+WORKDIR ${basedir}
+
+RUN wget -nv http://archive.apache.org/dist/lucene/solr/4.2.1/solr-4.2.1.tgz
+RUN tar xf solr-4.2.1.tgz && rm -f solr-4.2.1.tgz
+RUN cp -f schema.xml solr-4.2.1/example/solr/collection1/conf


Mime
View raw message