From e2e01f9d7607d8376971f008505476f3a1c9fd22 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Thu, 3 Aug 2017 12:40:44 +0900 Subject: [PATCH 1/2] Install additional gems Users can install additional gems using Gemfile.local and/or plugins/*/{Gemfile,PluginGemfile}. --- 3.1/docker-entrypoint.sh | 2 ++ 3.2/docker-entrypoint.sh | 2 ++ 3.3/docker-entrypoint.sh | 2 ++ 3.4/docker-entrypoint.sh | 2 ++ docker-entrypoint.sh | 2 ++ 5 files changed, 10 insertions(+) diff --git a/3.1/docker-entrypoint.sh b/3.1/docker-entrypoint.sh index 664a40c3..9dd0f6ba 100755 --- a/3.1/docker-entrypoint.sh +++ b/3.1/docker-entrypoint.sh @@ -101,6 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock + # ensure to install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index 664a40c3..9dd0f6ba 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -101,6 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock + # ensure to install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index 664a40c3..9dd0f6ba 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -101,6 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock + # ensure to install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index 664a40c3..9dd0f6ba 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -101,6 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock + # ensure to install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 664a40c3..9dd0f6ba 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -101,6 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock + # ensure to install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' From bcaee7ff541b6ff01b7593e44444b3d561f67472 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Aug 2017 13:18:49 -0700 Subject: [PATCH 2/2] Fix whitespace --- 3.1/docker-entrypoint.sh | 4 ++-- 3.2/docker-entrypoint.sh | 4 ++-- 3.3/docker-entrypoint.sh | 4 ++-- 3.4/docker-entrypoint.sh | 4 ++-- docker-entrypoint.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/3.1/docker-entrypoint.sh b/3.1/docker-entrypoint.sh index 9dd0f6ba..601f3822 100755 --- a/3.1/docker-entrypoint.sh +++ b/3.1/docker-entrypoint.sh @@ -101,8 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock - # ensure to install additional gems for Gemfile.local and plugins - bundle check || bundle install --without development test + # install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index 9dd0f6ba..601f3822 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -101,8 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock - # ensure to install additional gems for Gemfile.local and plugins - bundle check || bundle install --without development test + # install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index 9dd0f6ba..601f3822 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -101,8 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock - # ensure to install additional gems for Gemfile.local and plugins - bundle check || bundle install --without development test + # install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index 9dd0f6ba..601f3822 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -101,8 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock - # ensure to install additional gems for Gemfile.local and plugins - bundle check || bundle install --without development test + # install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9dd0f6ba..601f3822 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -101,8 +101,8 @@ case "$1" in # ensure the right database adapter is active in the Gemfile.lock cp "Gemfile.lock.${adapter}" Gemfile.lock - # ensure to install additional gems for Gemfile.local and plugins - bundle check || bundle install --without development test + # install additional gems for Gemfile.local and plugins + bundle check || bundle install --without development test if [ ! -s config/secrets.yml ]; then file_env 'REDMINE_SECRET_KEY_BASE'