Merge pull request #257 from themarshallproject/develop

v0.3.3

Author: GabeIsman

.ruby-version

@@ -1 +1 @@
-2.4.4
+2.4.5

DOCKER.md

@@ -5,11 +5,7 @@
 1. Run the following commands:
 
 ```
-docker-compose up -d database
-docker-compose build app
-docker-compose run app rake db:create db:migrate
-docker-compose run app rake users:create_admin
-docker-compose up app
+docker-compose up
 open http://localhost:3000
 ```
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.4
+FROM ruby:2.4.5
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -13,4 +13,16 @@ RUN bundle install
 COPY . /usr/src/app
 
 EXPOSE 3000
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]
+
+# install s6overlay so that we can run cron inside this container as well.
+ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
+RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \
+    && mkdir /config \
+    && apt-get update \
+    && apt-get install -y cron \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY rootfs/ /
+VOLUME ["/config"]
+
+ENTRYPOINT ["/init"]

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby '2.4.4'
+ruby '2.4.5'
 
-gem 'rails', '~> 5.2.1'
+gem 'rails', '~> 5.2.2'
 gem 'pg', '~> 0.21'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
@@ -19,7 +19,7 @@ gem 'bcrypt', '~> 3.1.12'
 gem 'puma', '~> 3.12'
 gem 'rails_12factor'
 
-gem 'simple_form', '~> 4.0'
+gem 'simple_form', '~> 4.1'
 
 gem 'jwt'
 gem 'premailer-rails'
@@ -28,13 +28,13 @@ gem 'httparty'
 gem 'diffy'
 gem 'kramdown'
 
-gem 'aws-sdk-sqs', '~> 1.6'
+gem 'aws-sdk-sqs', '~> 1.12'
 
 group :development, :test do
   gem 'byebug'
   gem 'rspec-rails', '~> 3.8'
   gem 'guard-rspec', require: false
-  gem 'factory_bot_rails', '~> 4.11'
+  gem 'factory_bot_rails', '~> 5.0'
   gem 'database_cleaner'
   gem 'sinatra'
 end