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

1 files changed, 22 insertions, 1 deletions

diff --git a/lib/gitlab/ci/config/entry/image.rb b/lib/gitlab/ci/config/entry/image.rb
index 10f35a2dbc1..897dcff8012 100644
--- a/lib/gitlab/ci/config/entry/image.rb
+++ b/lib/gitlab/ci/config/entry/image.rb
@@ -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