Skip to content

Commit

Permalink
Staging ITHC Release (#1026)
Browse files Browse the repository at this point in the history
Staging ITHC Release
  • Loading branch information
Stivaros committed May 7, 2019
2 parents 517e70d + d4b4732 commit b61b8bd
Show file tree
Hide file tree
Showing 14 changed files with 319 additions and 139 deletions.
12 changes: 12 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
FROM ministryofjustice/ruby:2.5.1-webapp-onbuild

# Adding argument support for ping.json
# ARG APPVERSION=unknown
# ARG APP_BUILD_DATE=unknown
# ARG APP_GIT_COMMIT=unknown
# ARG APP_BUILD_TAG=unknown

# Setting up ping.json variables
ENV APPVERSION ${APPVERSION:-unknown}
ENV APP_BUILD_DATE ${APP_BUILD_DATE:-unknown}
ENV APP_GIT_COMMIT ${APP_GIT_COMMIT:-unknown}
ENV APP_BUILD_TAG ${APP_BUILD_TAG:-unknown}

# Ensure the pdftk package is installed as a prereq for ruby PDF generation
ENV DEBIAN_FRONTEND noninteractive
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
Expand Down
18 changes: 10 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'jbuilder', '~> 2.8'
gem 'jquery-rails', '4.3.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.2.2.1'
gem 'rails', '5.2.3'
gem 'responders', '~> 2.4'

# Azure deployment so we need this
Expand All @@ -26,7 +26,7 @@ gem 'sass-rails', '~> 5.0'
gem 'turbolinks', '~> 5.2'

# Use unicorn as the app server
gem 'unicorn', '~> 5.4'
gem 'unicorn', '~> 5.5'

# Use null db adapter for the form objects
gem 'activerecord-nulldb-adapter', '~> 0.3'
Expand All @@ -38,7 +38,7 @@ group :development, :test do
gem 'awesome_print', '~> 1.8'
gem 'better_errors', '~> 2.5'
gem 'binding_of_caller', '~> 0.8'
gem 'capybara', '~> 3.13'
gem 'capybara', '~> 3.16'
gem 'codeclimate-test-reporter', '~> 0.4', require: nil
gem 'dotenv-rails', '~> 2.7'
gem 'factory_bot_rails', '~> 5.0'
Expand All @@ -48,21 +48,22 @@ group :development, :test do
gem 'rack-livereload', '~> 0.3'
gem 'rspec-its', '~> 1.2', require: 'rspec/its'
gem 'rspec-rails', '~> 3.8'
gem 'rubocop', '~> 0.65', :require => false
gem 'rubocop', '~> 0.67', :require => false
gem 'rubocop-rspec', '~> 1.32', :require => false
gem 'shoulda-matchers', '~> 3.1'
gem 'spring', '~> 2.0'
gem 'parallel_tests', '~> 2.28'
gem 'parallel_tests', '~> 2.28'
end

group :test do
gem 'webmock', '~> 3.5'
gem 'database_cleaner', '~> 1.7'
gem 'cucumber-rails', '~> 1.6', require: false
gem 'poltergeist', '1.18'
gem 'cucumber-rails', '~> 1.7', require: false
gem 'poltergeist', '~> 1.18'
gem 'capybara-screenshot', '~> 1.0'
gem 'site_prism', '~> 3.0'
gem 'selenium-webdriver', '~> 3.141'
gem 'selenium-webdriver', '~> 3.142'
gem 'rails-controller-testing', '~> 1.0'
gem 'climate_control', '~> 0.2'
end
Expand Down Expand Up @@ -96,7 +97,8 @@ gem 'simple_form', '~> 4.0'
gem 'slim-rails', '~> 3.2'
gem 'sidekiq', '~> 5.2'
gem 'sidekiq-failures', '~> 1.0'
gem 'uk_postcode', '~> 1.0'
gem 'sidekiq_alive', '~> 1.1'
gem 'uk_postcode', '~> 2.1'
gem 'susy', '~> 2.2'
gem 'zendesk_api', '~> 1.5.1x'
gem 'email_validator', '~> 1.6'
Expand Down
Loading

0 comments on commit b61b8bd

Please sign in to comment.