resolves issues from post deploy evaluation

.dockerignore

@@ -0,0 +1,12 @@
+.bundle
+.convox
+.env
+.git
+!.git/logs/HEAD
+db/*.sqlite3
+db/*.sqlite3-journal
+log/*
+tmp/*
+!tmp/.gitkeep
+sample-assets*
+dump.rdb

.env

@@ -0,0 +1,14 @@
+#POSTGRES_DB=goldenseal
+#POSTGRES_HOST=postgres
+#POSTGRES_PASSWORD=DatabaseFTW
+#POSTGRES_USER=postgres
+DEFAULT_HOST=localhost:8080
+DEPLOY_HOOK=CHANGEME
+DOCKER_PORT=8000:80
+PASSENGER_APP_ENV=development
+REGISTRY_HOST=registry.gitlab.com
+REGISTRY_URI=/notch8/washington-goldenseal
+SITE_URI=web.goldenseal.staging.notch8network.com
+SOLR_URL=http://localhost:8983/solr/development
+TAG=dev
+TEST_DB=goldenseal_test

.env.development

@@ -0,0 +1,4 @@
+VIRTUAL_PORT: 80
+VIRTUAL_HOST: goldenseal.docker
+SKIP_LDAP: true
+

.gitignore

@@ -9,6 +9,8 @@
 /db/*.sqlite3
 /db/*.sqlite3-journal
 
+public/uploads
+
 /log/*
 !/log/.keep
 /tmp
@@ -23,3 +25,11 @@ config/solr.yml
 config/redis.yml
 config/resque-pool.yml
 config/ldap.yml
+
+public/uploads
+sample-assets
+sample_assets.tgz
+**/*.swo
+**/*.swp
+
+ops/fits-1.0.5/*

.gitlab-ci.yml

@@ -0,0 +1,66 @@
+image: docker:17.04
+services:
+  - docker:dind
+
+stages:
+  - build
+  - review
+
+variables:
+  DOCKER_DRIVER: overlay
+  DOCKER_PORT: 80
+  PASSENGER_APP_ENV: development
+  RAILS_ENV: development
+  REGISTRY_HOST: registry.gitlab.com
+  REGISTRY_URI: /notch8/washington-goldenseal
+  TEST_DB: test
+  SECRET_KEY_BASE: 729ac8fd6f2ad97b45d9bdf6cbc6a83e01c53fcc0e7b3c2afac1dfb2906deccfd39b83e534938d4e2729e3787a72043794eb045568f089efddce51c17cc4160d
+  SKIP_LDAP: 'true'
+
+build:
+  stage: build
+  script:
+    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG"
+  variables:
+    GIT_STRATEGY: fetch
+  tags:
+    - docker
+
+review:
+  stage: review
+  type: deploy
+  environment:
+    name: review/$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+    url: http://web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.notch8network.com
+    on_stop: stop_review
+  only:
+    - branches
+  except:
+    - master
+  script:
+    - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
+    - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
+    - export RANCHER_ENVIRONMENT=staging
+    - export TAG=$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+    - export SITE_URI=web.$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG.staging.notch8network.com
+    - ./rancher-v0.4.1/rancher up -p -d -u -c -s $TAG -f docker-compose.ci.yml
+  variables:
+    GIT_STRATEGY: fetch
+  tags:
+    - docker
+
+stop_review:
+  stage: review
+  script:
+    - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
+    - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
+    - export RANCHER_ENVIRONMENT=staging
+    - ./rancher-v0.4.1/rancher rm $CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+  variables:
+    GIT_STRATEGY: none
+  when: manual
+  environment:
+    name: review/$CI_PROJECT_NAME-$CI_BUILD_REF_SLUG
+    action: stop

Dockerfile

@@ -0,0 +1,18 @@
+FROM registry.gitlab.com/notch8/washington-goldenseal/base:latest
+
+ADD https://time.is/just build-time
+COPY ops/nginx.sh /etc/service/nginx/run
+COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
+COPY ops/env.conf /etc/nginx/main.d/env.conf
+
+COPY . $APP_HOME
+
+ADD https://projects.iq.harvard.edu/files/fits/files/fits-1.0.5.zip /opt/
+RUN unzip /opt/fits-1.0.5.zip -d /opt
+RUN chmod a+x /opt/fits-1.0.5/fits.sh
+ENV PATH="/opt/fits-1.0.5:${PATH}"
+
+RUN bundle check || bundle install
+RUN chown -R app:app ./jetty
+
+CMD ["/sbin/my_init"]

Dockerfile.base

@@ -0,0 +1,60 @@
+FROM phusion/passenger-ruby23:0.9.27
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+    echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
+    apt-get install -y software-properties-common && \
+    apt-add-repository -y ppa:ansible/ansible && \
+    add-apt-repository -y ppa:webupd8team/java && \
+    apt-get update -qq && \
+    apt-get install -y build-essential nodejs yarn pv ansible libsasl2-dev libpq-dev postgresql-client \
+                       oracle-java8-installer zip unzip imagemagick tzdata redis-server && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    yarn config set no-progress && \
+    yarn config set silent
+
+ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
+
+
+RUN rm /etc/nginx/sites-enabled/default
+COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
+COPY ops/env.conf /etc/nginx/main.d/env.conf
+
+ENV APP_HOME /home/app/webapp
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
+  BUNDLE_JOBS=4
+
+COPY Gemfile* $APP_HOME/
+RUN bundle check || bundle install
+#RUN yarn install
+
+RUN touch /var/log/worker.log && chmod 666 /var/log/worker.log
+RUN mkdir /etc/service/worker
+COPY ops/worker.sh /etc/service/worker/run
+RUN chmod +x /etc/service/worker/run
+
+RUN mkdir /etc/service/redis
+COPY ops/redis.sh /etc/service/redis/run
+RUN chmod +x /etc/service/redis/run
+
+
+COPY . $APP_HOME
+RUN chown -R app $APP_HOME
+
+RUN /sbin/setuser app ./bin/setup && \
+    /sbin/setuser app rake jetty:clean && \
+    /sbin/setuser app rake curation_concerns:jetty:config
+RUN touch /var/log/jetty.log && chmod 666 /var/log/jetty.log
+
+
+# Asset complie and migrate if prod, otherwise just start nginx
+COPY ops/nginx.sh /etc/service/nginx/run
+RUN chmod +x /etc/service/nginx/run
+RUN rm -f /etc/service/nginx/down
+
+CMD ["/sbin/my_init"]

Gemfile

@@ -39,6 +39,8 @@ gem 'riiif', '0.2.0'
 gem 'openseadragon', '~> 0.2.1'
 gem 'angularjs-rails', '~> 1.4.4'
 gem 'ldp', '~> 0.4.1'
+gem 'blacklight_oai_provider', git: 'https://github.com/projectblacklight/blacklight_oai_provider.git', branch: 'v5.1'
+gem 'blacklight-spotlight', git: 'https://github.com/projectblacklight/spotlight.git', tag: 'v0.17.1'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -71,3 +73,12 @@ gem 'rsolr', '~> 1.0.6'
 gem 'devise'
 gem 'devise_ldap_authenticatable'
 gem 'devise-guests', '~> 0.3'
+
+gem 'font-awesome-rails'
+
+gem 'friendly_id'
+gem 'sitemap_generator'
+gem 'blacklight-gallery', '>= 0.3.0'
+gem 'blacklight-oembed'
+gem 'social-share-button'
+gem 'devise_invitable'