diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-05-25 12:28:22 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-05-25 12:28:22 +0300 |
commit | 019a3c781efd75a8ce44297519a724e322cfde96 (patch) | |
tree | d1621bead9bddc963f05bb42c61fe51728c5525b /lib/tasks | |
parent | 4618e538be02eaa324b21de4b1d7a34f1359e025 (diff) | |
parent | 718fe268c48b3b77b2b3d901b0c688a06e82053d (diff) |
Merge branch 'fix-registry-backups' into 'master'
Fix backups if registry is disabled
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749
See merge request !4263
Diffstat (limited to 'lib/tasks')
-rw-r--r-- | lib/tasks/gitlab/backup.rake | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index d97d974ec20..596eaca6d0d 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -179,18 +179,26 @@ namespace :gitlab do task create: :environment do $progress.puts "Dumping container registry images ... ".blue - if ENV["SKIP"] && ENV["SKIP"].include?("registry") - $progress.puts "[SKIPPED]".cyan + if Gitlab.config.registry.enabled + if ENV["SKIP"] && ENV["SKIP"].include?("registry") + $progress.puts "[SKIPPED]".cyan + else + Backup::Registry.new.dump + $progress.puts "done".green + end else - Backup::Registry.new.dump - $progress.puts "done".green + $progress.puts "[DISABLED]".cyan end end task restore: :environment do $progress.puts "Restoring container registry images ... ".blue - Backup::Registry.new.restore - $progress.puts "done".green + if Gitlab.config.registry.enabled + Backup::Registry.new.restore + $progress.puts "done".green + else + $progress.puts "[DISABLED]".cyan + end end end |