kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add temporary CANARY env vars to be set in Kubernetes-with-canary.gitlab-ci.yml and used in page_layout_helper.rb

Browse source
This commit is contained in:
Luke "Jared" Bennett 2017-06-27 12:49:50 +01:00
parent be1b27960a
commit ed31624970
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/page_layout_helper.rb
View file

@ -35,7 +35,9 @@ module PageLayoutHelper
end end
def favicon def favicon
Rails.env.development? ? 'favicon-blue.ico' : 'favicon.ico' return 'favicon-yellow.ico' if ENV['CANARY'] == 'true'
return 'favicon-blue.ico' if Rails.env.development?
'favicon.ico'
end end
def page_image def page_image

2
vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml vendored
View file

@ -25,7 +25,7 @@ build:
canary: canary:
stage: canary stage: canary
script: script:
- command canary - CANARY=true command canary
environment: environment:
name: production name: production
url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN