Merge pull request #119 from dhollinger/docker_fixes

Some docker fixes

Rakefile

@@ -26,25 +26,27 @@ namespace :db do
  end
 end
 
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
+if ENV['SINATRA_ENV'] != 'production'
+ require 'rubocop/rake_task'
+ RuboCop::RakeTask.new
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+ require 'rspec/core/rake_task'
+ RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run all tests'
-task test: %i[rubocop spec]
+ desc 'Run all tests'
+ task test: %i[rubocop spec]
 
-require 'coveralls/rake/task'
-desc 'Run all tests and report to coverage tools'
-task test_and_report_coverage: [:test] do
- Coveralls::RakeTask.new
- Rake::Task['coveralls:push'].invoke
-end
+ require 'coveralls/rake/task'
+ desc 'Run all tests and report to coverage tools'
+ task test_and_report_coverage: [:test] do
+  Coveralls::RakeTask.new
+  Rake::Task['coveralls:push'].invoke
+ end
 
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
- config.user = 'voxpupuli'
- config.project = 'puppet_webhook'
- config.future_release = PuppetWebhook::VERSION
+ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+ config.user = 'voxpupuli'
+ config.project = 'puppet_webhook'
+ config.future_release = PuppetWebhook::VERSION
+ end
 end
 # vim: syntax=ruby

build/docker/Dockerfile

@@ -2,10 +2,12 @@ FROM 'ruby:2.5' as rubybuilder
 ARG version=master
 
 # Replace with a pull from releases page
+RUN gem install bundler:2.1.4
+
 RUN apt-get install git && \
  git clone -b $version https://github.com/voxpupuli/puppet_webhook.git app/ && \
  cd /app && \
- bundle install
+ bundle install --without development
 
 RUN mkdir /root/.ssh && echo "StrictHostKeyChecking no" >> /root/.ssh/config