Merge pull request #25 from uofa/staging

Release Merge

.gitignore

@@ -4,5 +4,7 @@ src/public/uploads
 src/public/uploads/*
 src/log
 src/log/*
+postgres-data/*
 .env
+.ruby-version
 

Dockerfile

@@ -34,6 +34,9 @@ RUN apt-get install -y curl
 # For image conversion
 RUN apt-get install -y imagemagick
 
+# Create old uploads stub in the container
+RUN mkdir -p /old-uploads
+
 # Create the server direcotory in the container
 RUN mkdir -p /lacr-search
 WORKDIR /lacr-search
@@ -42,7 +45,8 @@ WORKDIR /lacr-search
 ADD src/Gemfile /lacr-search/Gemfile
 ADD src/Gemfile.lock /lacr-search/Gemfile.lock
 
-# Install requered gems
+# Install required gems
+RUN bundle update --bundler
 RUN bundle install
 
 

docker-compose.yml

@@ -13,12 +13,14 @@ services:
     expose:
       - 5433
       - 5432
+    volumes:
+      - ./postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
 
   es:
-    image: elasticsearch:latest
+    image: elasticsearch:5
     restart: unless-stopped
     expose:
      - 9200
@@ -35,9 +37,12 @@ services:
     command: bundle exec rails s -p 80 -b '0.0.0.0'
     volumes:
       - ./src:/lacr-search
+      - /docker/lacr-search/src/public/uploads:/old-uploads
     environment:
       BASEX_ADMIN: ${BASEX_ADMIN}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+      BASEX_READONLY: ${BASEX_READONLY}
+      BASEX_CREATEONLY: ${BASEX_READONLY}
 
     ports:
       - "80:80"

src/Gemfile

@@ -1,18 +1,18 @@
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
   "https://github.com/#{repo_name}.git"
 end
 
 gem 'rspec'
 gem 'lograge'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails'
+gem 'rails', '>= 5.2.2.1'
 # Use PostgreSQL as the database for Active Record
 gem 'pg'
 # Use Puma as the app server
-gem 'puma'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 gem 'sass-rails'
 # Use Uglifier as compressor for JavaScript assets
@@ -27,7 +27,7 @@ gem 'jquery-ui-rails' # Add JavaScript for UI
 # Ruby Gem of the Bootstrap
 gem 'less-rails' # Javascript runtime
 gem 'twitter-bootstrap-rails'
-gem "font-awesome-rails"
+gem 'font-awesome-rails'
 
 gem 'carrierwave' # File upload
 gem 'groupdate' # Simple way to group by: day, week, etc.
@@ -37,29 +37,37 @@ gem 'prawn' # PDF file generator
 gem 'will_paginate-bootstrap' # Pagination library
 
 # API for Elasticsearch
-gem 'searchkick'
+gem 'searchkick', '~> 3.1.2'
 gem 'oj' # Significantly increase performance with faster JSON generation.
 gem 'typhoeus' # Significantly increase performance with persistent HTTP connections
 
-#User Authentication
-gem 'devise'
+# User Authentication
+gem 'devise', '>= 4.6.0'
 gem 'devise-bootstrap-views'
 
+group :development, :test do
+  # gem security audit
+  gem 'bundler-audit'
+end
+
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
+  gem 'byebug'
   gem 'listen', '~> 3.0.5'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  # Spring speeds up development by keeping your application running in the
+  # background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'byebug'
+  # Access an IRB console on exception pages or by using <%= console %>
+  # anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
 end
 
 group :test do
-	gem 'cucumber-rails', :require => false
-	# database_cleaner is not required, but highly recommended
-	gem 'database_cleaner'
-  # for testing JavaScript, require older version selenium and firefox version 47.0.1 for more info check:
+  gem 'cucumber-rails', require: false
+  # database_cleaner is not required, but highly recommended
+  gem 'database_cleaner'
+  # for testing JavaScript, require older version selenium and
+  # firefox version 47.0.1 for more info check:
   # https://github.com/teamcapybara/capybara#drivers
   gem 'selenium-webdriver', '~> 2.53.4'
-end
+end