fix js-tests.override

the recent change to Dockerfile and docker-compose yamls
neglected to modify the js-tests.override.yml

flag = none

Change-Id: Id2e923bb4ed8f25946ab95364ce76898f2c178b7
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/267897
Reviewed-by: Kyle Rosenbaum <krosenbaum@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2021-06-25 13:26:32 -06:00
parent c6c2f9ba9d
commit 0b78f170c6
3 changed files with 19 additions and 13 deletions

View File

@ -4,16 +4,17 @@
version: '2.3'
services:
js-tests:
build: ./docker-compose/karma
build:
context: .
dockerfile: docker-compose/karma/Dockerfile
volumes:
- .:/usr/src/app
- brandable_css_brands:/usr/src/app/app/stylesheets/brandable_css_brands
- 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
- tmp:/usr/src/app/tmp
- yarn-cache:/home/docker/.cache/yarn
environment:
NODE_ENV: CI
cap_add:
- SYS_ADMIN
# for linux the default profile restricts mount usage, set to have no restrictions
security_opt:
- apparmor:unconfined
entrypoint: /root/entrypoint.sh
command: yarn run test:karma:watch:headless

View File

@ -1,4 +1,4 @@
FROM instructure/node:14
FROM canvas-lms_web:latest
ENV APP_HOME /usr/src/app/
ENV NODE_ENV test
@ -12,6 +12,4 @@ RUN apt-get update --quiet=2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ./google-chrome-stable_current_amd64.deb
USER docker
EXPOSE 9876

View File

@ -4,10 +4,17 @@
version: '2.3'
services:
js-tests:
build: ./docker-compose/karma
build:
context: .
dockerfile: docker-compose/karma/Dockerfile
volumes:
- code:/usr/src/app
- yarn-cache:/home/docker/.cache/yarn
environment:
NODE_ENV: CI
cap_add:
- SYS_ADMIN
# for linux the default profile restricts mount usage, set to have no restrictions
security_opt:
- apparmor:unconfined
entrypoint: /root/entrypoint.sh
command: yarn run test:karma:watch:headless