Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now
This commit is contained in:
parent
97f58bae87
commit
445cdb7579
|
@ -38,8 +38,6 @@ public/assets/
|
|||
public/uploads.*
|
||||
public/uploads/
|
||||
shared/artifacts/
|
||||
shared/tmp/artifacts-uploads/
|
||||
shared/tmp/artifacts-cache/
|
||||
rails_best_practices_output.html
|
||||
/tags
|
||||
tmp/
|
||||
|
|
|
@ -9,11 +9,11 @@ class ArtifactUploader < CarrierWave::Uploader::Base
|
|||
end
|
||||
|
||||
def self.artifacts_upload_path
|
||||
File.expand_path('shared/tmp/artifacts-uploads/', Rails.root)
|
||||
File.expand_path('shared/artifacts/tmp/uploads/', Rails.root)
|
||||
end
|
||||
|
||||
def self.artifacts_cache_path
|
||||
File.expand_path('shared/tmp/artifacts-cache/', Rails.root)
|
||||
File.expand_path('shared/artifacts/tmp/cache/', Rails.root)
|
||||
end
|
||||
|
||||
def initialize(build, field)
|
||||
|
|
|
@ -248,8 +248,6 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
|
|||
|
||||
# Change the permissions of the directory where CI artifacts are stored
|
||||
sudo chmod -R u+rwX shared/artifacts/
|
||||
sudo chmod -R u+rwX shared/tmp/artifacts-uploads/
|
||||
sudo chmod -R u+rwX shared/tmp/artifacts-cache/
|
||||
|
||||
# Copy the example Unicorn config
|
||||
sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
|
||||
|
|
|
@ -134,7 +134,7 @@ module API
|
|||
end
|
||||
|
||||
def require_gitlab_workhorse!
|
||||
unless headers['Gitlab-Git-Http-Server'].present? || headers['GitLab-Git-HTTP-Server'].present?
|
||||
unless env['HTTP_GITLAB_WORKHORSE'].present?
|
||||
forbidden!('Request should be executed via GitLab Workhorse')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -132,7 +132,7 @@ describe Ci::API::API do
|
|||
let(:post_url) { ci_api("/builds/#{build.id}/artifacts") }
|
||||
let(:delete_url) { ci_api("/builds/#{build.id}/artifacts") }
|
||||
let(:get_url) { ci_api("/builds/#{build.id}/artifacts") }
|
||||
let(:headers) { { "Gitlab-Git-Http-Server" => "1.0" } }
|
||||
let(:headers) { { "GitLab-Workhorse" => "1.0" } }
|
||||
let(:headers_with_token) { headers.merge(Ci::API::Helpers::BUILD_TOKEN_HEADER => build.project.token) }
|
||||
|
||||
describe "POST /builds/:id/artifacts/authorize" do
|
||||
|
|
Loading…
Reference in New Issue