Add Dockerfile templates

3 files changed, 35 insertions, 1 deletions

diff --git a/lib/api/templates.rb b/lib/api/templates.rb
index b9e718147e1..c5dc7f46ebd 100644
--- a/lib/api/templates.rb
+++ b/lib/api/templates.rb
@@ -2,7 +2,8 @@ module API
   class Templates < Grape::API
     GLOBAL_TEMPLATE_TYPES = {
       gitignores:     Gitlab::Template::GitignoreTemplate,
-      gitlab_ci_ymls: Gitlab::Template::GitlabCiYmlTemplate
+      gitlab_ci_ymls: Gitlab::Template::GitlabCiYmlTemplate,
+      dockerfiles:    Gitlab::Template::DockerfileTemplate
     }.freeze
 
     helpers do
diff --git a/lib/gitlab/template/dockerfile_template.rb b/lib/gitlab/template/dockerfile_template.rb
new file mode 100644
index 00000000000..d5d3e045a42
--- /dev/null
+++ b/lib/gitlab/template/dockerfile_template.rb
@@ -0,0 +1,30 @@
+module Gitlab
+  module Template
+    class DockerfileTemplate < BaseTemplate
+      def content
+        explanation = "# This file is a template, and might need editing before it works on your project."
+        [explanation, super].join("\n")
+      end
+
+      class << self
+        def extension
+          'Dockerfile'
+        end
+
+        def categories
+          {
+            "General" => ''
+          }
+        end
+
+        def base_dir
+          Rails.root.join('vendor/dockerfile')
+        end
+
+        def finder(project = nil)
+          Gitlab::Template::Finders::GlobalTemplateFinder.new(self.base_dir, self.extension, self.categories)
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/dockerfile/HTTPd.dockerfile.yml b/vendor/dockerfile/HTTPd.dockerfile.yml
new file mode 100644
index 00000000000..2f05427323c
--- /dev/null
+++ b/vendor/dockerfile/HTTPd.dockerfile.yml
@@ -0,0 +1,3 @@
+FROM httpd:alpine
+
+COPY ./ /usr/local/apache2/htdocs/