Skip to content

Commit 01b7fe6

Browse files
Merge pull request #303 from Workiva/greglittlefield-wf-patch-1
Fix bad aviary.yaml syntax
2 parents 60f8eda + aee9a57 commit 01b7fe6

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

Dockerfile

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
FROM drydock-prod.workiva.net/workiva/dart_build_image:1
22

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
104
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
115
echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
126
apt-get -qq update && apt-get install -y google-chrome-stable && \
137
mv /usr/bin/google-chrome-stable /usr/bin/google-chrome && \
148
sed -i --follow-symlinks -e 's/\"\$HERE\/chrome\"/\"\$HERE\/chrome\" --no-sandbox/g' /usr/bin/google-chrome
159

16-
# Fail the build if the version doesn't match what we expected
17-
RUN google-chrome --version | grep " $EXPECTED_CHROME_VERSION\."
18-
1910
# TODO: Remove this and instead run it within the github actions CI on the stable channel once SDK lower bound is >=2.9.3
2011
RUN dartfmt --line-length=120 --dry-run --set-exit-if-changed .
2112

@@ -46,22 +37,13 @@ RUN apt-get install -y \
4637
wget \
4738
&& rm -rf /var/lib/apt/lists/*
4839

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
5641
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
5742
echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
5843
apt-get -qq update && apt-get install -y google-chrome-stable && \
5944
mv /usr/bin/google-chrome-stable /usr/bin/google-chrome && \
6045
sed -i --follow-symlinks -e 's/\"\$HERE\/chrome\"/\"\$HERE\/chrome\" --no-sandbox/g' /usr/bin/google-chrome
6146

62-
# Fail the build if the version doesn't match what we expected
63-
RUN google-chrome --version | grep " $EXPECTED_CHROME_VERSION\."
64-
6547
WORKDIR /build/
6648
ADD . /build/
6749

aviary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ exclude:
44
- ^example/
55
- ^test/
66
- ^tool/
7-
- # Ignore compiled JS files and source maps
7+
# Ignore compiled JS files and source maps
88
- ^lib/react\w*\.js(\.map)?$

0 commit comments

Comments
 (0)