summaryrefslogtreecommitdiff
path: root/qa/Dockerfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-20 09:24:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-20 09:24:38 +0000
commit898e2cc1dfa88b4ac39cb4b35011f61b37f57b51 (patch)
treec6524edb6c9a43cccf93be05c36883fde1a53ee4 /qa/Dockerfile
parentb5571e6e22cdacc81f78eff5943d68c8ba220fbb (diff)
downloadgitlab-ce-898e2cc1dfa88b4ac39cb4b35011f61b37f57b51.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
-rw-r--r--qa/Dockerfile6
1 files changed, 6 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index e4b860b08b2..126d9fbc591 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -39,6 +39,12 @@ RUN wget -q https://chromedriver.storage.googleapis.com/$(wget -q -O - https://c
RUN unzip chromedriver_linux64.zip -d /usr/local/bin
##
+# Install K3d local cluster support
+# https://github.com/rancher/k3d
+#
+RUN curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v1.3.4 bash
+
+##
# Install gcloud and kubectl CLI used in Auto DevOps test to create K8s
# clusters
#