diff --git a/docker-compose/js-tests.override.yml b/docker-compose/js-tests.override.yml index ac5c10122e2..73c92c6d687 100644 --- a/docker-compose/js-tests.override.yml +++ b/docker-compose/js-tests.override.yml @@ -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 diff --git a/docker-compose/karma/Dockerfile b/docker-compose/karma/Dockerfile index 82cbe7210da..d20d1696475 100644 --- a/docker-compose/karma/Dockerfile +++ b/docker-compose/karma/Dockerfile @@ -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 diff --git a/docker-compose/mutagen/js-tests.override.yml b/docker-compose/mutagen/js-tests.override.yml index 9c7a51e5ab8..3b2b2ee30f6 100644 --- a/docker-compose/mutagen/js-tests.override.yml +++ b/docker-compose/mutagen/js-tests.override.yml @@ -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