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

tweak docker_dev_setup script 

Adds the dinghy tap before trying to install it.

Test Plan:
1. On a machine running OSX without dinghy installed, run the
   docker_dev_setup script. Verify dinghy is set up without issue.

Change-Id: I0479323aefd21554fb3bc2a8f00ced727b497496
Reviewed-on: https://gerrit.instructure.com/132850
Reviewed-by: Omar Khan <okhan@instructure.com>
Tested-by: Jenkins
QA-Review: Omar Khan <okhan@instructure.com>
Product-Review: Omar Khan <okhan@instructure.com>
This commit is contained in:
Spencer Olson 2017-11-14 17:20:28 -06:00
parent 20761e64e1
commit 0b7d4135a0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/docker/README.md
View File

@ -8,7 +8,7 @@ You need Docker. Don't have Docker yet? Go [here](getting_docker.md) for details
This command should get you going:
```bash
./scripts/docker_dev_setup.sh
./script/docker_dev_setup.sh
```
Now you can do `docker-compose up` and you should be good to go. If you're

12
script/docker_dev_setup.sh
View File

@ -73,10 +73,14 @@ function install_dependencies {
[[ ${#packages[@]} -gt 0 ]] || return 0
message "First, we need to install some dependencies."
if [[ $OS == 'Darwin' ]] && ! installed brew; then
echo 'We need homebrew to install dependencies, please install that first!'
echo 'See https://brew.sh/'
exit 1
if [[ $OS == 'Darwin' ]]; then
if ! installed brew; then
echo 'We need homebrew to install dependencies, please install that first!'
echo 'See https://brew.sh/'
exit 1
elif ! brew ls --versions dinghy > /dev/null; then
brew tap codekitchen/dinghy
fi
elif [[ $OS == 'Linux' ]] && ! installed apt-get; then
echo 'This script only supports Debian-based Linux (for now - contributions welcome!)'
exit 1