Fix issues with js-tests Docker container
Previous commits renamed the generated_2 volume but missed the js-tests container. Some scripts (notably script/nuke_node.sh) rely on git. Chromium is now only officially distributed as a snap. Since we do not have snap available in the base image, using the official Google Chrome deb package is a workaround to get js-tests working. flag = none Change-Id: Iab40ef504d9dad6d7ae56a0c9a4485ee8468a92d Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/265912 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> QA-Review: Dustin Cowles <dustin.cowles@instructure.com> Reviewed-by: Aaron Ogata <aogata@instructure.com> Reviewed-by: James Butters <jbutters@instructure.com> Product-Review: Dustin Cowles <dustin.cowles@instructure.com>
This commit is contained in:
parent
5a9d82707b
commit
56ad038287
|
@ -8,7 +8,7 @@ services:
|
|||
volumes:
|
||||
- .:/usr/src/app
|
||||
- brandable_css_brands:/usr/src/app/app/stylesheets/brandable_css_brands
|
||||
- generated_2:/usr/src/app/public/dist
|
||||
- public_dist:/usr/src/app/public/dist
|
||||
- i18nliner_node_modules:/usr/src/app/gems/canvas_i18nliner/node_modules
|
||||
- log:/usr/src/app/log
|
||||
- node_modules:/usr/src/app/node_modules
|
||||
|
|
|
@ -2,14 +2,15 @@ FROM instructure/node:14
|
|||
|
||||
ENV APP_HOME /usr/src/app/
|
||||
ENV NODE_ENV test
|
||||
ENV CHROME_BIN /usr/bin/chromium-browser
|
||||
ENV CHROME_BIN /usr/bin/google-chrome
|
||||
|
||||
USER root
|
||||
|
||||
RUN apt-get update --quiet=2 \
|
||||
&& apt-get install --quiet=2 chromium-browser > /dev/null \
|
||||
&& curl -LOs https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
|
||||
&& apt-get install --quiet=2 -y ./google-chrome-stable_current_amd64.deb git \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ./google-chrome-stable_current_amd64.deb
|
||||
|
||||
USER docker
|
||||
|
||||
|
|
Loading…
Reference in New Issue