Download as
Browse Code »

Commit 4867b210dfcac3b41978157b492fa86288eebd56

Authored by Jacob Vosmaer
1 parent 84440be2
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Delete symlinked directories during build

Showing 2 changed files with 1 additions and 5 deletions   Show diff stats
config/software/gitlab-core.rb
  Diff comments   View file @4867b21
@@ -59,6 +59,7 @@ build do @@ -59,6 +59,7 @@ build do
59 command "rm config/gitlab.yml config/database.yml" 59 command "rm config/gitlab.yml config/database.yml"
60 60
61 command "mkdir -p #{install_dir}/embedded/service/gitlab-core" 61 command "mkdir -p #{install_dir}/embedded/service/gitlab-core"
  62 + command "rm -rf log tmp public/uploads"
62 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-core/" 63 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-core/"
63 64
64 # Create a wrapper for the rake tasks of the Rails app 65 # Create a wrapper for the rake tasks of the Rails app
files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
  Diff comments   View file @4867b21
@@ -92,11 +92,6 @@ end @@ -92,11 +92,6 @@ end
92 "/opt/gitlab/embedded/service/gitlab-core/public/uploads" => gitlab_core_public_uploads_dir, 92 "/opt/gitlab/embedded/service/gitlab-core/public/uploads" => gitlab_core_public_uploads_dir,
93 "/opt/gitlab/embedded/service/gitlab-core/log" => gitlab_core_log_dir 93 "/opt/gitlab/embedded/service/gitlab-core/log" => gitlab_core_log_dir
94 }.each do |link_dir, target_dir| 94 }.each do |link_dir, target_dir|
95 - directory link_dir do  
96 - action :delete  
97 - recursive true  
98 - end  
99 -  
100 link link_dir do 95 link link_dir do
101 to target_dir 96 to target_dir
102 end 97 end