diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /qa/Dockerfile | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 7f90e4bf5bf..6310e4b290d 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -3,11 +3,10 @@ LABEL maintainer="GitLab Quality Department <quality@gitlab.com>" ENV DEBIAN_FRONTEND="noninteractive" ENV DOCKER_VERSION="17.09.0-ce" -ENV CHROME_VERSION="83.0.4103.61-1" -ENV CHROME_DRIVER_VERSION="83.0.4103.39" +ENV CHROME_VERSION="84.0.4147.89-1" +ENV CHROME_DRIVER_VERSION="84.0.4147.30" ENV CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_amd64.deb" ENV CHROME_URL="https://s3.amazonaws.com/gitlab-google-chrome-stable/${CHROME_DEB}" -ENV K3D_VERSION="1.3.4" ## # Add support for stretch-backports @@ -49,12 +48,6 @@ RUN unzip chromedriver_linux64.zip -d /usr/local/bin RUN rm -f chromedriver_linux64.zip ## -# Install K3d local cluster support -# https://github.com/rancher/k3d -# -RUN curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG="v${K3D_VERSION}" bash - -## # Install gcloud and kubectl CLI used in Auto DevOps test to create K8s # clusters # |