diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-29 17:18:13 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-29 17:37:33 -0700 |
| commit | 2b0daa9f621982415b8b791301aa98dcdbe9db0f (patch) | |
| tree | ff606f5f772941a0fbdf9a975b2ac7bb4ac469d7 | |
| parent | 1c508b951c1f5682e6036ff28a0f2218687a1326 (diff) | |
| download | gitlab-ce-2b0daa9f621982415b8b791301aa98dcdbe9db0f.tar.gz | |
Workaround Chrome apt-get repository issues
Instead of depending on Google's apt repository, we can use the cached
S3 repo that we use for gitlab-build-images to download Chrome.
| -rw-r--r-- | qa/Dockerfile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 74be373b8e8..09cc7df5598 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -28,15 +28,12 @@ RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-17.09. ## # Install Google Chrome version with headless support # -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 wget -q -O chrome.deb https://s3.amazonaws.com/gitlab-google-chrome-stable/google-chrome-stable_74.0.3729.169-1_amd64.deb && dpkg -i chrome.deb && rm -f chrome.deb ## # Install chromedriver to make it work with Selenium # -RUN wget -q https://chromedriver.storage.googleapis.com/$(wget -q -O - https://chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip -RUN unzip chromedriver_linux64.zip -d /usr/local/bin +RUN wget -q https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip && unzip chromedriver_linux64.zip -d /usr/local/bin && rm -f chromedriver_linux64.zip ## # Install gcloud and kubectl CLI used in Auto DevOps test to create K8s |