Remove container registry on project removal

2 files changed, 10 insertions, 1 deletions

diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index df5054f08d7..70bfc1fd533 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -28,6 +28,10 @@ module Projects
       Project.transaction do
         project.destroy!
 
+        unless remove_registry_tags
+          raise_error('Failed to remove project image registry. Please try again or contact administrator')
+        end
+
         unless remove_repository(repo_path)
           raise_error('Failed to remove project repository. Please try again or contact administrator')
         end
@@ -61,6 +65,10 @@ module Projects
       end
     end
 
+    def remove_registry_tags
+      project.image_registry.delete_tags
+    end
+
     def raise_error(message)
       raise DestroyError.new(message)
     end
diff --git a/lib/image_registry/repository.rb b/lib/image_registry/repository.rb
index f4f4ba65afc..c45fa2911e7 100644
--- a/lib/image_registry/repository.rb
+++ b/lib/image_registry/repository.rb
@@ -31,7 +31,8 @@ module ImageRegistry
       end
     end
 
-    def delete
+    def delete_tags
+      return unless tags
       tags.each(:delete)
     end
   end