summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-04-12 08:36:17 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-12 10:26:49 +0000
commit8e6398a0a1f03d9425ab011df7299fa4ae5e0abd (patch)
tree6ceca8240bfc0f99ece3c1f2709cdb996d1c920f
parent0dd44521b08331bd5c3f8b9f86f89f4ade0ddb6a (diff)
downloadgitlab-ce-8e6398a0a1f03d9425ab011df7299fa4ae5e0abd.tar.gz
Merge branch 'sh-allow-unauth-chrome' into 'master'
Allow unauthenticated downloads of Chrome Closes #60441 See merge request gitlab-org/gitlab-ce!27297 (cherry picked from commit 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e) 84d6dd3e Allow unauthenticated downloads of Chrome
-rw-r--r--qa/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index ca7f9accb70..ae3ec2acfdf 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -30,7 +30,7 @@ RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-17.09.
#
RUN curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
-RUN apt-get update -q && apt-get install -y google-chrome-stable && apt-get clean
+RUN apt-get update -q && apt-get install -y --allow-unauthenticated google-chrome-stable && apt-get clean
##
# Install chromedriver to make it work with Selenium