Commit Graph

9 Commits

Author SHA1 Message Date
Derek Bender e268c057a3 fix canvas-planner docker build process
Change-Id: Ib6f54fb4c21b01cd4a8318b3d55ec2741e8f2d1f
Reviewed-on: https://gerrit.instructure.com/147151
Tested-by: Jenkins
Reviewed-by: Bryan Petty <bpetty@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
2018-04-17 14:44:18 +00:00
Brad Horrocks 902fca830d Fix build :fingers-crossed:
Change-Id: I2f904ddee198167efc11bc762823105a3c704b16
Reviewed-on: https://gerrit.instructure.com/118045
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-07-06 19:24:41 +00:00
Jon Jensen ef480cd1c3 docker enhancements/fixes, fixes SD-2499, refs gh-1043
bring the development docker image down from 3.6GB -> 2.4GB

add a production docker image that weighs in at 1.2GB, which should speed
up end-to-end tests

template-ize web Dockerfiles so that common stuff stays consistent, volume
dirs are set up properly, etc.

test plan:
1. docker-based builds should pass
2. docker image should be usable (docker-compose up, etc)

Change-Id: I41ebb155090f66e346bdc285ca5c613ee5793127
Reviewed-on: https://gerrit.instructure.com/112859
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-05-26 20:57:24 +00:00
Bryan Petty b9c4b8f4c0 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-15 18:39:27 +00:00
Bryan Petty 4dbbe759a7 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 19:57:54 +00:00
Bryan Petty 616e054fa5 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-28 22:58:58 +00:00
Brad Horrocks 3c809153d1 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-11-15 17:06:37 +00:00
Bryan Petty e2430c88db 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-09-19 15:31:50 +00:00
Brian Palmer 4b42a9f66d 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>
2015-03-30 20:59:48 +00:00