Download as
Browse Code »

Commit 8da230e73d0f10ff9db3660ecaeb8cff98276824

Authored by Jacob Vosmaer
2 parents 9c8b7f30 a3945744
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'remove_rsync' into 'master' 

Remove rsync

See merge request !180
Showing 4 changed files with 5 additions and 10 deletions   Show diff stats
config/software/gitlab-cookbooks.rb
  Diff comments   View file @8da230e
@@ -18,13 +18,11 @@ @@ -18,13 +18,11 @@
18 18
19 name "gitlab-cookbooks" 19 name "gitlab-cookbooks"
20 20
21 -dependency "rsync"  
22 -  
23 always_build true 21 always_build true
24 22
25 source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root) 23 source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
26 24
27 build do 25 build do
28 command "mkdir -p #{install_dir}/embedded/cookbooks" 26 command "mkdir -p #{install_dir}/embedded/cookbooks"
29 - command "#{install_dir}/embedded/bin/rsync --delete -a ./ #{install_dir}/embedded/cookbooks/" 27 + sync project_dir, "#{install_dir}/embedded/cookbooks/"
30 end 28 end
config/software/gitlab-ctl.rb
  Diff comments   View file @8da230e
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 18
19 name "gitlab-ctl" 19 name "gitlab-ctl"
20 20
21 -dependency "rsync"  
22 dependency "omnibus-ctl" 21 dependency "omnibus-ctl"
23 22
24 source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root) 23 source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root)
@@ -65,5 +64,5 @@ done @@ -65,5 +64,5 @@ done
65 command "chmod 755 #{install_dir}/bin/gitlab-ctl" 64 command "chmod 755 #{install_dir}/bin/gitlab-ctl"
66 65
67 # additional omnibus-ctl commands 66 # additional omnibus-ctl commands
68 - command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/" 67 + sync project_dir, "#{install_dir}/embedded/service/omnibus-ctl/"
69 end 68 end
config/software/gitlab-rails.rb
  Diff comments   View file @8da230e
@@ -26,7 +26,6 @@ dependency "bundler" @@ -26,7 +26,6 @@ dependency "bundler"
26 dependency "libxml2" 26 dependency "libxml2"
27 dependency "libxslt" 27 dependency "libxslt"
28 dependency "curl" 28 dependency "curl"
29 -dependency "rsync"  
30 dependency "libicu" 29 dependency "libicu"
31 dependency "postgresql" 30 dependency "postgresql"
32 dependency "python-docutils" 31 dependency "python-docutils"
@@ -39,7 +38,7 @@ build do @@ -39,7 +38,7 @@ build do
39 env = with_standard_compiler_flags(with_embedded_path) 38 env = with_standard_compiler_flags(with_embedded_path)
40 39
41 # GitLab assumes it can extract the Git revision of the currently version 40 # GitLab assumes it can extract the Git revision of the currently version
42 - # from the Git repo the code lives in at boot. Because of our rsync later on, 41 + # from the Git repo the code lives in at boot. Because of our sync later on,
43 # this assumption does not hold. The sed command below patches the GitLab 42 # this assumption does not hold. The sed command below patches the GitLab
44 # source code to include the Git revision of the code included in the omnibus 43 # source code to include the Git revision of the code included in the omnibus
45 # build. 44 # build.
@@ -84,7 +83,7 @@ build do @@ -84,7 +83,7 @@ build do
84 command "cp db/schema.rb db/schema.rb.bundled" 83 command "cp db/schema.rb db/schema.rb.bundled"
85 84
86 command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" 85 command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
87 - command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-rails/" 86 + sync project_dir, "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore}
88 87
89 # Create a wrapper for the rake tasks of the Rails app 88 # Create a wrapper for the rake tasks of the Rails app
90 erb :dest => "#{install_dir}/bin/gitlab-rake", 89 erb :dest => "#{install_dir}/bin/gitlab-rake",
config/software/gitlab-shell.rb
  Diff comments   View file @8da230e
@@ -20,13 +20,12 @@ name "gitlab-shell" @@ -20,13 +20,12 @@ name "gitlab-shell"
20 default_version "91753e937e729c0fedc9a5dd7ae52b85436b4971" # 1.9.7 20 default_version "91753e937e729c0fedc9a5dd7ae52b85436b4971" # 1.9.7
21 21
22 dependency "ruby" 22 dependency "ruby"
23 -dependency "rsync"  
24 23
25 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git" 24 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
26 25
27 build do 26 build do
28 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell" 27 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
29 - command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/" 28 + sync project_dir, "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore}
30 block do 29 block do
31 env_shebang = "#!/usr/bin/env ruby" 30 env_shebang = "#!/usr/bin/env ruby"
32 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script| 31 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|