Bump GitLab and cookbook to 8.17

Simply having node.js installed is no longer enough as further
dependencies are required. Leverage the nodejs cookbook to install
them for us.

Author: chewi

attributes/default.rb

@@ -34,12 +34,12 @@
 
 # Set github URL for gitlab
 default['gitlab']['git_url'] = 'https://github.com/gitlabhq/gitlabhq.git'
-default['gitlab']['git_branch'] = '8-14-stable'
+default['gitlab']['git_branch'] = '8-17-stable'
 
 # gitlab-shell attributes
 default['gitlab']['shell']['home'] = node['gitlab']['home'] + '/gitlab-shell'
 default['gitlab']['shell']['git_url'] = 'https://github.com/gitlabhq/gitlab-shell.git'
-default['gitlab']['shell']['git_branch'] = 'v4.0.2'
+default['gitlab']['shell']['git_branch'] = 'v4.1.1'
 default['gitlab']['shell']['gitlab_host'] = nil
 
 # Database setup
@@ -69,6 +69,7 @@
   redisio::default
   redisio::enable
   ruby_build
+  nodejs::install
 )
 
 # Redisio instance name
@@ -79,7 +80,6 @@
   cmake
   curl
   golang
-  nodejs
   python-docutils
   sudo
   wget
@@ -165,5 +165,5 @@
 default['nginx']['default_site_enabled'] = false
 
 # GitLab Workhorse
-default['gitlab']['workhorse_revision'] = 'v1.0.1'
+default['gitlab']['workhorse_revision'] = 'v1.3.0'
 default['gitlab']['workhorse_repository'] = 'https://gitlab.com/gitlab-org/gitlab-workhorse.git'

metadata.rb

@@ -4,7 +4,7 @@
 description 'Installs/Configures gitlab'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 name 'gitlab'
-version '8.14.0'
+version '8.17.0'
 issues_url 'https://github.com/atomic-penguin/cookbook-gitlab/issues'
 source_url 'https://github.com/atomic-penguin/cookbook-gitlab'
 
@@ -16,6 +16,7 @@
   git
   logrotate
   ncurses
+  nodejs
   openssh
   postgresql
   readline

recipes/default.rb

@@ -380,14 +380,22 @@ class unix_stream_socket connectto;
   not_if { ::File.exist?("#{node['gitlab']['home']}/gitlab-workhorse/gitlab-workhorse") }
 end
 
-# Precompile assets
-execute 'gitlab-bundle-precompile-assets' do
-  command "#{bundler_binary} exec rake assets:precompile RAILS_ENV=production"
+nodejs_npm 'gitlab' do
+  path node['gitlab']['app_home']
+  user node['gitlab']['user']
+  group node['gitlab']['group']
+  options ['--only=production']
+  json true
+end
+
+# Compile assets
+execute 'gitlab-bundle-assets-compile' do
+  command "#{bundler_binary} exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production && touch .assets-compiled"
   cwd node['gitlab']['app_home']
   user node['gitlab']['user']
   group node['gitlab']['group']
   environment('LANG' => 'en_US.UTF-8', 'LC_ALL' => 'en_US.UTF-8')
-  only_if { Dir["#{node['gitlab']['app_home']}/public/assets/*"].empty? }
+  not_if { File.exist?("#{node['gitlab']['app_home']}/.assets-compiled") }
 end
 
 # Initialize database