kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove Gitlab::Ci::Config::Entry::DockerImage

This commit is contained in:
Tomasz Maczukin 2017-06-12 13:35:32 +02:00
parent 3e75fd6c5b
commit 645c865141
No known key found for this signature in database
GPG Key ID: 7E9EB2E4B0F625CD
3 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/gitlab/ci/config/entry/docker_image.rb
View File

@ -1,31 +0,0 @@
module Gitlab
module Ci
class Config
module Entry
module DockerImage
def hash?
@config.is_a?(Hash)
end
def string?
@config.is_a?(String)
end
def name
value[:name]
end
def entrypoint
value[:entrypoint]
end
def value
return { name: @config } if string?
return @config if hash?
{}
end
end
end
end
end
end

23
lib/gitlab/ci/config/entry/image.rb
View File

@ -7,7 +7,6 @@ module Gitlab
#
class Image < Node
include Validatable
include DockerImage
ALLOWED_KEYS = %i[name entrypoint].freeze
@ -18,6 +17,28 @@ module Gitlab
validates :name, type: String, presence: true
validates :entrypoint, type: String, allow_nil: true
end
def hash?
@config.is_a?(Hash)
end
def string?
@config.is_a?(String)
end
def name
value[:name]
end
def entrypoint
value[:entrypoint]
end
def value
return { name: @config } if string?
return @config if hash?
{}
end
end
end
end

3
lib/gitlab/ci/config/entry/service.rb
View File

@ -5,9 +5,8 @@ module Gitlab
##
# Entry that represents a configuration of Docker service.
#
class Service < Node
class Service < Image
include Validatable
include DockerImage
ALLOWED_KEYS = %i[name entrypoint command alias].freeze