From 79f2a0323ae9723381602f5085c594490a927cc0 Mon Sep 17 00:00:00 2001
From: Chris Beer <chris@cbeer.info>
Date: Wed, 17 May 2017 15:28:21 -0700
Subject: [PATCH] Use docker to run solr

---
 .travis.yml           |  9 ++++++++-
 tasks/blacklight.rake | 11 ++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd480f8b73..a8742d39ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
+dist: trusty
 language: ruby
-sudo: false
+sudo: required
 
 notifications:
   email: false
 
+services:
+  - docker
+
 rvm:
   - 2.4.1
 
@@ -20,6 +24,9 @@ matrix:
 before_install:
   - gem update --system
   - gem install bundler
+  - docker run --name my_solr -d -p 8983:8983 solr
+  - docker cp ./solr/conf my_solr:/opt/solr/blacklight-solr-conf
+  - sleep 10; docker exec -it --user=solr my_solr bin/solr create_core -c blacklight-core -d /opt/solr/blacklight-solr-conf
 
 env:
  - "RAILS_VERSION=5.0.3"
diff --git a/tasks/blacklight.rake b/tasks/blacklight.rake
index 945fe8cce7..106505020c 100644
--- a/tasks/blacklight.rake
+++ b/tasks/blacklight.rake
@@ -13,14 +13,11 @@ EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"
 task :ci => ['blacklight:generate'] do
-  SolrWrapper.wrap do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
-      within_test_app do
-        system "RAILS_ENV=test rake blacklight:index:seed"
-      end
-      Rake::Task['blacklight:coverage'].invoke
-    end
+  within_test_app do
+    system "RAILS_ENV=test rake blacklight:index:seed"
   end
+
+  Rake::Task['blacklight:coverage'].invoke
 end
 
 namespace :blacklight do