DO NOT MERGE WITH MASTER. Split ember and rails. Dockerize GUP for development.

.gitignore

@@ -15,7 +15,7 @@
 /log/*.log
 /tmp
 
-config/database.yml
+#config/database.yml
 *~
 \#*#
 .#*
@@ -30,7 +30,7 @@ config/database.yml
 #Ignore nbproject
 nbproject/
 
-config/config_secret.yml
+#config/config_secret.yml
 config/passwd
 config/deploy.yml
 # Ignore generated css etc.

Dockerfile-backend

@@ -0,0 +1,17 @@
+FROM ruby:2.4
+
+COPY Gemfile Gemfile.lock /apps/
+WORKDIR /apps/
+RUN apt-get update \
+ && apt-get -y install locales \
+ && apt-get clean \
+ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+ && locale-gen en_US.UTF-8 \
+ && touch /var/tmp/gup_auth_override.enable \
+ && bundle install
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV RAILS_LOG_TO_STDOUT=true
+
+CMD ["bundle", "exec", "rails", "server", "-p", "3000", "-b", "0.0.0.0"]

Dockerfile-frontend

@@ -0,0 +1,14 @@
+FROM node:6
+
+COPY frontend/package.json /apps/
+WORKDIR /apps
+ENV PATH=/apps/bin:$PATH
+
+RUN set -ex \
+  && npm install -g ember-cli \
+  && npm install -g bower \
+  && npm install -g phantomjs-prebuilt \
+  && npm install -g check-dependencies
+
+USER node
+CMD ["ember", "server", "--live-reload-port", "35730"]

Dockerfile-solr

@@ -0,0 +1,15 @@
+FROM solr:5
+
+RUN precreate-core gup-publications \
+ && precreate-core gup-people \
+ && precreate-core gup-journals \
+ && precreate-core gup-guresearch
+
+COPY solr/postgresql-42.2.5.jar /opt/solr/server/lib/
+COPY solr/default/conf/solrconfig.xml solr/gup-publications/conf/schema.xml solr/gup-publications/conf/dataimportconfig.xml /opt/solr/server/solr/mycores/gup-publications/conf/
+COPY solr/default/conf/solrconfig.xml solr/gup-people/conf/schema.xml solr/gup-people/conf/dataimportconfig.xml /opt/solr/server/solr/mycores/gup-people/conf/
+COPY solr/default/conf/solrconfig.xml solr/gup-journals/conf/schema.xml solr/gup-journals/conf/dataimportconfig.xml /opt/solr/server/solr/mycores/gup-journals/conf/
+COPY solr/default/conf/solrconfig.xml solr/gup-guresearch/conf/schema.xml solr/gup-guresearch/conf/dataimportconfig.xml /opt/solr/server/solr/mycores/gup-guresearch/conf/
+COPY solr/full-reindex.sh /opt/solr/bin/
+
+

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 # Use this version of ruby (rvm will use this line)
-ruby "2.3.1"
+# ruby "2.3.1"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.7'
+gem 'rails', '4.2.8'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 0.15'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -32,8 +32,6 @@ group :test do
   gem 'webmock'
 end
 
-gem "ember-cli-rails"
-
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem 'rack-cors'
 
@@ -47,4 +45,4 @@ gem 'rsolr'
 gem 'will_paginate', '~> 3.0.5'
 gem 'spreadsheet'
 gem 'oai'
-gem 'naturalsort', :require => 'natural_sort_kernel'
+gem 'naturalsort', :require => 'natural_sort_kernel'