🌌 Clusterize

Dockerfile

@@ -14,14 +14,17 @@ EXPOSE 3000
 CMD rake jetty:clean && rake jetty:config && rake jetty:start && bundle exec rake db:migrate RAILS_ENV=development && bundle exec rails s -b 0.0.0.0
 
 FROM base as production
+ENV RAILS_ENV=production
+ENV AAPB_LOG=log/build.log
 
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
-
 COPY . .
 
-RUN rake jetty:clean && rake jetty:config 
+RUN bundle exec rake assets:precompile
+
+RUN RAILS_ENV=production bundle exec rake db:migrate
 
-CMD rake jetty:start && bundle exec rake db:migrate RAILS_ENV=development && bundle exec rails s -b 0.0.0.0
+CMD rails s -b 0.0.0.0

app/controllers/oai_controller.rb

@@ -19,7 +19,7 @@ def index
     @response_date = Time.now.strftime('%FT%T')
 
     @records =
-      RSolr.connect(url: 'http://localhost:8983/solr/')
+      RSolr.connect(url: config.solr_url)
            .get('select', params: {
                   'q' => 'access_types:"' + PBCorePresenter::PUBLIC_ACCESS + '"',
                   'fl' => 'id,timestamp,xml',

app/models/pb_core_presenter.rb

@@ -419,7 +419,7 @@ def playlist_order
   end
   def playlist_map
     @playlist_map ||= begin
-      response = RSolr.connect(url: 'http://localhost:8983/solr/').get('select', params:
+      response = RSolr.connect(url: config.solr_url).get('select', params:
       {
         'fl' => 'playlist_order,id',
         'fq' => "playlist_group:#{playlist_group}",

config/blacklight.yml

@@ -2,18 +2,18 @@
 # each environment can have a jetty_path with absolute or relative
 # (to app root) path to a jetty/solr install. This is used
 # by the rake tasks that start up solr automatically for testing
-# and by rake solr:marc:index.  
+# and by rake solr:marc:index.
 #
 # jetty_path is not used by a running Blacklight application
 # at all. In general you do NOT need to deploy solr in Jetty, you can deploy it
-# however you want.  
+# however you want.
 # jetty_path is only required for rake tasks that need to know
-# how to start up solr, generally for automated testing. 
+# how to start up solr, generally for automated testing.
 
 development:
-  url: http://127.0.0.1:8983/solr/blacklight-core
+  url: http://127.0.0.1:8983/solr/
 test:
-  url: http://127.0.0.1:8983/solr/blacklight-core
+  url: http://127.0.0.1:8983/solr/
   # TODO: Get separate dev and test cores, and change this back to 8888. bug #1
 production:
-  url: http://127.0.0.1:8983/solr/blacklight-core
+  url: <%= ENV['SOLR_URL'] || 'http://127.0.0.1:8983/solr/' %>

config/environments/production.rb

@@ -51,7 +51,7 @@
   # config.log_tags = [ :subdomain, :uuid ]
 
   # Only keep up to 10 log files of ~ 1MB each.
-  config.logger = ActiveSupport::Logger.new('/var/www/aapb/current/log/production.log', 10, 1.megabytes)
+  config.logger = ActiveSupport::Logger.new(ENV['AAPB_LOG'] || '/var/www/aapb/current/log/production.log', 10, 1.megabytes)
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store

lib/solr.rb

@@ -10,7 +10,8 @@ class Solr
   def initialize
     environment = ENV['RAILS_ENV'] || DEFAULT
     conf = YAML.load_file(Rails.root + 'config/blacklight.yml')
-    @connect = RSolr.connect(url: conf[environment]['url'])
+    solr_url = ENV['SOLR_URL'] || conf[environment]['url']
+    @connect = RSolr.connect(url: solr_url + 'blacklight-core')
   end
 
   attr_reader :connect

scripts/lib/downloader.rb

@@ -112,7 +112,7 @@ def process_query(query)
     q = QueryMaker.translate(query)
     $LOG.info("Query solr for #{query}")
 
-    @options[:ids] = RSolr.connect(url: 'http://localhost:8983/solr/')
+    @options[:ids] = RSolr.connect(url: config.solr_url)
                           .get('select',
                                params: { q: q, fl: 'id', rows: MAX_ROWS }
                               )['response']['docs'].map { |doc| doc['id'] }