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/.dockerignore

37 lines
712 B
Plaintext
Raw Normal View History

expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
.DS_Store
.dockerignore
docker-compose based dev environment Adds a docker-compose.yml file, some containers for dependencies, and some docker-compose-friendly config files. See doc/development_with_docker.md for instructions on how to use. Change-Id: I5eaee8a3e3c84bb608282bfd44ec7d49a123ef5f Reviewed-on: https://gerrit.instructure.com/45508 Reviewed-by: Zach Wily <zach@instructure.com> Reviewed-by: Addison Higham <ahigham@instructure.com> Reviewed-by: Brian Palmer <brianp@instructure.com> Tested-by: Jenkins Product-Review: Zach Wily <zach@instructure.com> QA-Review: Zach Wily <zach@instructure.com>
2014-12-10 06:46:27 +08:00
.git
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
.gitignore
.idea
docker-compose/
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
!docker-compose/config/*
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
docker-compose.local.*.yml
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
docker-compose.override.yml
docker-compose.yml
add more compiled assets to .dockerignore Adds more missing entries to .dockerignore for compiled assets. Test Plan: 1. Verify successful docker image build from new checkout. Change-Id: I88b1a1260fb3eb47c8f6961fe23d2667af588a07 Reviewed-on: https://gerrit.instructure.com/97463 Reviewed-by: Jeff Belser <jbelser@instructure.com> Tested-by: Jenkins Reviewed-by: Marc Alan Phillips <mphillips@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-14 00:12:49 +08:00
client_apps/canvas_quizzes/dist/
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
client_apps/canvas_quizzes/node_modules/
add more compiled assets to .dockerignore Adds more missing entries to .dockerignore for compiled assets. Test Plan: 1. Verify successful docker image build from new checkout. Change-Id: I88b1a1260fb3eb47c8f6961fe23d2667af588a07 Reviewed-on: https://gerrit.instructure.com/97463 Reviewed-by: Jeff Belser <jbelser@instructure.com> Tested-by: Jenkins Reviewed-by: Marc Alan Phillips <mphillips@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-14 00:12:49 +08:00
client_apps/canvas_quizzes/tmp/
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
gems/canvas_i18nliner/node_modules/
log/
node_modules/
public/dist/
add more compiled assets to .dockerignore Adds more missing entries to .dockerignore for compiled assets. Test Plan: 1. Verify successful docker image build from new checkout. Change-Id: I88b1a1260fb3eb47c8f6961fe23d2667af588a07 Reviewed-on: https://gerrit.instructure.com/97463 Reviewed-by: Jeff Belser <jbelser@instructure.com> Tested-by: Jenkins Reviewed-by: Marc Alan Phillips <mphillips@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-14 00:12:49 +08:00
public/doc/
public/javascripts/client_apps/
public/javascripts/compiled/
public/javascripts/jst/
public/javascripts/jsx/
public/javascripts/translations/
fix incorrect .dockerignore of translations/_core_en.js A docker ignore entry was recently added for: public/javascripts/translations/ This is a mirror of the .gitignore entry, however, there is one file checked into the git repo that shouldn't be ignored, and is necessary for docker image builds. This adds that file back. Test Plan: 1. Docker image successfully builds from running: docker-compose build web Change-Id: Ia83fb6673197cb5cb8f98d9c230d65342b6be37c Reviewed-on: https://gerrit.instructure.com/97721 Reviewed-by: Ryan Norton <rnorton@instructure.com> Tested-by: Jenkins Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-16 02:29:35 +08:00
!public/javascripts/translations/_core_en.js
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
public/optimized/
public/webpack-dist/
public/webpack-dist-optimized/
add more compiled assets to .dockerignore Adds more missing entries to .dockerignore for compiled assets. Test Plan: 1. Verify successful docker image build from new checkout. Change-Id: I88b1a1260fb3eb47c8f6961fe23d2667af588a07 Reviewed-on: https://gerrit.instructure.com/97463 Reviewed-by: Jeff Belser <jbelser@instructure.com> Tested-by: Jenkins Reviewed-by: Marc Alan Phillips <mphillips@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-14 00:12:49 +08:00
spec/javascripts/compiled/
spec/javascripts/webpack/
expand .dockerignore entries for development Avoids sending NPM packages and compiled assets to the docker build context. Test Plan: 1. Verify that the docker image still builds successfully. Change-Id: Ia47f6f0b1e2c3cab93cac8b97cdfe74f2d035d2c Reviewed-on: https://gerrit.instructure.com/88809 Reviewed-by: Tyler Pickett <tpickett@instructure.com> Tested-by: Jenkins QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com>
2016-08-26 05:28:53 +08:00
tmp/
vendor/bundle/
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
Dockerfile
Gemfile.lock
add more compiled assets to .dockerignore Adds more missing entries to .dockerignore for compiled assets. Test Plan: 1. Verify successful docker image build from new checkout. Change-Id: I88b1a1260fb3eb47c8f6961fe23d2667af588a07 Reviewed-on: https://gerrit.instructure.com/97463 Reviewed-by: Jeff Belser <jbelser@instructure.com> Tested-by: Jenkins Reviewed-by: Marc Alan Phillips <mphillips@instructure.com> Product-Review: Bryan Petty <bpetty@instructure.com> QA-Review: Bryan Petty <bpetty@instructure.com>
2016-12-14 00:12:49 +08:00
mkmf.log