ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
canvas-lms/docker-compose/js-phantomjs-tests.override...

19 lines
627 B
YAML
Raw Normal View History

set +x on docker entrypoints that require it Docker entrypoints can't be executed unless they are set as executable. Also fixes a few other discrepancies: - adds common docker-compose.local.*.yml to .dockerignore - updates docs for enabling phantomjs-tests container - mount common volumes for js-tests and phantomjs-tests containers Test Plan: 1. Enable phantomjs-tests and js-tests docker containers. 2. docker-compose build --pull 3. Ensure phantomjs-tests and js-tests containers work. Change-Id: I1ab20575f9936b6cfc2c61501441b1137c9df4cb Reviewed-on: https://gerrit.instructure.com/95690 Reviewed-by: Brad Horrocks <bhorrocks@instructure.com> Reviewed-by: Michael Brewer-Davis <mbd@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-11-19 04:22:38 +08:00
# to use this add docker-compose/js-phantomjs-tests.override.yml
docker-compose.yml v2 If you have a docker-compose.override file you'll want to move it somewhere else. mv docker-compose.override.yml docker-compose.`whoami`.yml Once you've updated your override file to the version 2 syntax, you should add it to the COMPOSE_FILE environment variable. Probably in a .env file in the project root. Test plan: You'll need to remove your existing canvas containers and volumes to fully test this. to do so run this **BEFORE** you checkout this patchset ``` docker-compose down docker-compose ps -q | docker rm docker volume ls -q | grep canvaslms | xargs docker volume rm ``` then you should be able to get up and running using the following ``` cp docker-compose/config/* config/ dc build dcr web bundle exec rake db:create db:initial_setup dc up ``` You should be able to access canvas like normal Change-Id: Ia7ff76cfdd4f46278fc1cb2a03969fdadaa4a434 Reviewed-on: https://gerrit.instructure.com/91008 Reviewed-by: Zach Wily <zach@instructure.com> Tested-by: Jenkins QA-Review: August Thornton <august@instructure.com> Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2016-09-23 02:42:34 +08:00
# to your COMPOSE_FILE var in .env
version: '2'
services:
phantomjs-tests:
set +x on docker entrypoints that require it Docker entrypoints can't be executed unless they are set as executable. Also fixes a few other discrepancies: - adds common docker-compose.local.*.yml to .dockerignore - updates docs for enabling phantomjs-tests container - mount common volumes for js-tests and phantomjs-tests containers Test Plan: 1. Enable phantomjs-tests and js-tests docker containers. 2. docker-compose build --pull 3. Ensure phantomjs-tests and js-tests containers work. Change-Id: I1ab20575f9936b6cfc2c61501441b1137c9df4cb Reviewed-on: https://gerrit.instructure.com/95690 Reviewed-by: Brad Horrocks <bhorrocks@instructure.com> Reviewed-by: Michael Brewer-Davis <mbd@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-11-19 04:22:38 +08:00
build: ./docker-compose/phantomjs-karma
volumes:
- .:/app
- generated_1:/app/public/javascripts/client_apps
- generated_2:/app/public/dist
- i18nliner_node_modules:/app/gems/canvas_i18nliner/node_modules
- node_modules:/app/node_modules
- quizzes_node_modules:/app/client_apps/canvas_quizzes/node_modules
- selinimum_node_modules:/app/gems/selinimum/node_modules
environment:
NODE_ENV: CI
VIRTUAL_HOST: phantom.docker