You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/09 18:01:23 UTC
[03/18] allura git commit: [#7907] ticket:860 Change docker config to
use official solr image
[#7907] ticket:860 Change docker config to use official solr image
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/48c7ea96
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/48c7ea96
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/48c7ea96
Branch: refs/heads/in/7907
Commit: 48c7ea96c1ca7b3cb7abf35661f5be88a9c64afe
Parents: 39ca47f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Nov 24 14:32:26 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Dec 9 17:32:26 2015 +0200
----------------------------------------------------------------------
docker-compose.yml | 7 +++----
solr_config/Dockerfile | 32 --------------------------------
2 files changed, 3 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/48c7ea96/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index b6aeaa7..f22a532 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,13 +43,12 @@ taskd:
- outmail
solr:
- build: solr_config
- working_dir: /solr/solr-4.2.1/example
- command: java -jar start.jar
+ image: solr:5.3.1
ports:
- "8983:8983"
volumes:
- - /allura-data/solr:/solr/solr-4.2.1/example/solr/collection1/data
+ - solr_config/allura:/opt/solr/server/solr/allura
+ - /allura-data/solr:/opt/solr/server/solr/allura/data
mongo:
image: mongo:2.6
http://git-wip-us.apache.org/repos/asf/allura/blob/48c7ea96/solr_config/Dockerfile
----------------------------------------------------------------------
diff --git a/solr_config/Dockerfile b/solr_config/Dockerfile
deleted file mode 100644
index 714840c..0000000
--- a/solr_config/Dockerfile
+++ /dev/null
@@ -1,32 +0,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.
-
-FROM ubuntu:14.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