Skip to content

Commit

Permalink
Build assets before running migrations
Browse files Browse the repository at this point in the history
The migrations now fail with `BrandableCSS::DefaultMD5NotUpToDateError`
if you try to run them before building assets. This commit updates the
docker_dev_setup.sh script to build assets first to avoid this error.

Also updates the script to use the correct docker package: `docker` in
the Ubuntu package repos is actually some kind of system tray thing. We
want the `docker.io` package:
https://packages.ubuntu.com/xenial/docker.io

Refs instructuregh-1300

Change-Id: Iba9a6f9bffe1a9e60bd715f1214caaab0394d37e
Reviewed-on: https://gerrit.instructure.com/150865
Reviewed-by: Ryan Shaw <[email protected]>
Tested-by: Jenkins
Product-Review: Omar Khan <[email protected]>
QA-Review: Omar Khan <[email protected]>
  • Loading branch information
Omar Khan committed Jun 26, 2018
1 parent 57943ae commit 6fb94bd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions script/docker_dev_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ $OS == 'Darwin' ]]; then
dependencies='docker docker-machine docker-compose dinghy'
elif [[ $OS == 'Linux' ]]; then
install='sudo apt-get update && sudo apt-get install -y'
dependencies='docker docker-compose'
dependencies='docker.io docker-compose'
else
echo 'This script only supports MacOS and Linux :('
exit 1
Expand Down Expand Up @@ -258,8 +258,8 @@ function setup_canvas {
copy_docker_config
build_images
install_gems
prepare_database
compile_assets
prepare_database
}

function display_next_steps {
Expand Down

0 comments on commit 6fb94bd

Please sign in to comment.