From bc35f1ea58d9c6a5ad1fee35e7483aa39aaf97c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 11 Dec 2015 14:24:28 +0100 Subject: [PATCH] Define new dependencies as a separate group This allows user to exclude this from the bundle and also gives us the option to define the group as optional some time later. --- .travis.yml | 2 +- Gemfile | 7 +++++-- doc/operation_guides/manual/installation-guide.md | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8baa19bac..62bf826502 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ cache: - frontend/node_modules - frontend/bower_components -bundler_args: --without development production +bundler_args: --without development production docker branches: only: diff --git a/Gemfile b/Gemfile index 03283d2f55..495cf6c67a 100644 --- a/Gemfile +++ b/Gemfile @@ -233,9 +233,12 @@ group :opf_plugins do gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', branch: 'release/5.0' end -gem 'passenger' +# TODO: Make this group :optional when bundler v10.x +# is matured enough that we can use this everywhere +# http://bundler.io/blog/2015/06/24/version-1-10-released.html +group :docker do + gem 'passenger' -group :production do # Used to easily precompile assets gem 'sqlite3', require: false gem 'rails_12factor', require: !!ENV['HEROKU'] diff --git a/doc/operation_guides/manual/installation-guide.md b/doc/operation_guides/manual/installation-guide.md index 96eb05d005..aa7f058515 100644 --- a/doc/operation_guides/manual/installation-guide.md +++ b/doc/operation_guides/manual/installation-guide.md @@ -146,7 +146,7 @@ with OpenProject. For more information, see https://github.com/opf/openproject-c [openproject@host] git clone https://github.com/opf/openproject-ce.git --branch stable/5 --depth 1 [openproject@host] cd openproject-ce [openproject@host] gem install bundler -[openproject@host] bundle install --deployment --without postgres sqlite development test therubyracer +[openproject@host] bundle install --deployment --without postgres sqlite development test therubyracer docker [openproject@host] npm install ```