|
1 | 1 | FROM drydock-prod.workiva.net/workiva/dart_build_image:1
|
2 | 2 |
|
3 |
| -# Chrome install taken from https://github.com/Workiva/dart_unit_test_image/blob/master@%7B13-01-2021%7D/Dockerfile |
4 |
| - |
5 |
| -# Set the expected Chrome major version. This allows us to update the expected version when |
6 |
| -# we need to roll out a new version of this base image with a new chrome version as the only change |
7 |
| -ENV EXPECTED_CHROME_VERSION=87 |
8 |
| - |
9 |
| -# Install Chrome |
| 3 | +# Chrome install adapted from https://github.com/Workiva/dart_unit_test_image/blob/master@%7B13-01-2021%7D/Dockerfile |
10 | 4 | RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
|
11 | 5 | echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
|
12 | 6 | apt-get -qq update && apt-get install -y google-chrome-stable && \
|
13 | 7 | mv /usr/bin/google-chrome-stable /usr/bin/google-chrome && \
|
14 | 8 | sed -i --follow-symlinks -e 's/\"\$HERE\/chrome\"/\"\$HERE\/chrome\" --no-sandbox/g' /usr/bin/google-chrome
|
15 | 9 |
|
16 |
| -# Fail the build if the version doesn't match what we expected |
17 |
| -RUN google-chrome --version | grep " $EXPECTED_CHROME_VERSION\." |
18 |
| - |
19 | 10 | # TODO: Remove this and instead run it within the github actions CI on the stable channel once SDK lower bound is >=2.9.3
|
20 | 11 | RUN dartfmt --line-length=120 --dry-run --set-exit-if-changed .
|
21 | 12 |
|
@@ -46,22 +37,13 @@ RUN apt-get install -y \
|
46 | 37 | wget \
|
47 | 38 | && rm -rf /var/lib/apt/lists/*
|
48 | 39 |
|
49 |
| -# Chrome install taken from https://github.com/Workiva/dart_unit_test_image/blob/master@%7B13-01-2021%7D/Dockerfile |
50 |
| - |
51 |
| -# Set the expected Chrome major version. This allows us to update the expected version when |
52 |
| -# we need to roll out a new version of this base image with a new chrome version as the only change |
53 |
| -ENV EXPECTED_CHROME_VERSION=87 |
54 |
| - |
55 |
| -# Install Chrome |
| 40 | +# Chrome install adapted from https://github.com/Workiva/dart_unit_test_image/blob/master@%7B13-01-2021%7D/Dockerfile |
56 | 41 | RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
|
57 | 42 | echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
|
58 | 43 | apt-get -qq update && apt-get install -y google-chrome-stable && \
|
59 | 44 | mv /usr/bin/google-chrome-stable /usr/bin/google-chrome && \
|
60 | 45 | sed -i --follow-symlinks -e 's/\"\$HERE\/chrome\"/\"\$HERE\/chrome\" --no-sandbox/g' /usr/bin/google-chrome
|
61 | 46 |
|
62 |
| -# Fail the build if the version doesn't match what we expected |
63 |
| -RUN google-chrome --version | grep " $EXPECTED_CHROME_VERSION\." |
64 |
| - |
65 | 47 | WORKDIR /build/
|
66 | 48 | ADD . /build/
|
67 | 49 |
|
|
0 commit comments