mirror of
https://github.com/instructure/canvas-lms.git
synced 2025-08-26 03:13:20 +08:00
remove dinghy from docker_dev scripts
dinghy is deprecated so we are removing it from our docker setup scripts, now defaulting to mutagen with docker desktop for mac. flag = none closes: DE-1099 Test Plan: -Jenkins passes -run docker_dev_setup from clean machine -setup uses mutagen with docker desktop on mac -setup uses mutagen with docker on linux -dinghy_http_proxy can still be used -if dinghy machine found running, fail script with message Change-Id: I1916c16807e7893174f32074674125cec93bcb40 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287535 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com> QA-Review: James Butters <jbutters@instructure.com> Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
@ -2,15 +2,11 @@
|
||||
source script/common/utils/common.sh
|
||||
source script/common/os/linux/impl.sh
|
||||
source script/common/utils/dory_setup.sh
|
||||
dependencies='docker,docker-compose 1.20.0'
|
||||
dependencies='docker,docker-compose 1.20.0,mutagen 0.13.0,mutagen-compose'
|
||||
|
||||
message "It looks like you're using Linux. Let's set that up."
|
||||
|
||||
if is_mutagen; then
|
||||
dependencies+=',mutagen 0.13.0,mutagen-compose'
|
||||
print_mutagen_intro
|
||||
fi
|
||||
|
||||
print_mutagen_intro
|
||||
set_service_util
|
||||
check_dependencies
|
||||
check_for_dory
|
||||
|
Reference in New Issue
Block a user