Merge pull request #601 from PecanProject/fix-frozen-string

create duplicate of environment variable
PecanProject · Oct 11, 2018 · 61ef1b8 · 61ef1b8
2 parents 80460f4 + 854b061
commit 61ef1b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ section for the next release.
 For more information about this file see also [Keep a Changelog](http://keepachangelog.com/) .
 
 
+## [5.0.4] - 2018-10-11
+
+### Fixes
+
+- #600 : Error when starting BETY as docker container due to frozen variable.
+
 ## [5.0.3] - 2018-09-28
 
 ### Fixes

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -128,7 +128,7 @@ def commit_is_tagged?
 
 def commit_tags
   e = ENV['BETY_GIT_TAGS']
-  ref_names = e.nil? || e.empty? ? `git log --pretty=format:"%d" -1` : e
+  ref_names = e.nil? || e.empty? ? `git log --pretty=format:"%d" -1` : e.dup
   if /tag/.match(ref_names).nil?
     return ""
   end

diff --git a/hooks/build b/hooks/build
@@ -1,5 +1,9 @@
 #!/usr/bin/env sh
 
+# so we can run script outside of docker hub
+IMAGE_NAME=${IMAGE_NAME:-"pecan/bety:latest"}
+
+# build the actual container
 docker build \
     --build-arg BETY_GIT_TAGS="$(git log --pretty=format:%d -1)" \
     --build-arg BETY_GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" \