summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2017-04-26 15:57:44 +0000
committerDouwe Maan <douwe@gitlab.com>2017-04-26 15:57:44 +0000
commitdf85a7c00439f7a9636b6f46448336d76df7f7da (patch)
treed59481d95e0f8dfcc48a382ae3dd707b18e32e6a /lib/tasks
parent61afa9b5c45deccda81bddf33bb1cd6bc69280fd (diff)
downloadgitlab-ce-df85a7c00439f7a9636b6f46448336d76df7f7da.tar.gz
Submodule Dockerfile templates
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/update_templates.rake8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake
index cb2adc81c9d..1b04e1350ed 100644
--- a/lib/tasks/gitlab/update_templates.rake
+++ b/lib/tasks/gitlab/update_templates.rake
@@ -5,7 +5,7 @@ namespace :gitlab do
end
def update(template)
- sub_dir = template.repo_url.match(/([a-z-]+)\.git\z/)[1]
+ sub_dir = template.repo_url.match(/([A-Za-z-]+)\.git\z/)[1]
dir = File.join(vendor_directory, sub_dir)
unless clone_repository(template.repo_url, dir)
@@ -45,7 +45,11 @@ namespace :gitlab do
Template.new(
"https://gitlab.com/gitlab-org/gitlab-ci-yml.git",
/(\.{1,2}|LICENSE|CONTRIBUTING.md|Pages|autodeploy|\.gitlab-ci.yml)\z/
- )
+ ),
+ Template.new(
+ "https://gitlab.com/gitlab-org/Dockerfile.git",
+ /(\.{1,2}|LICENSE|CONTRIBUTING.md|\.Dockerfile)\z/
+ ),
].freeze
def vendor_directory