9 Commits

Author SHA1 Message Date
997fa82278 Fix Canvas LMS docker setup scripts
flag = none
closes DE-1748

test plan:
	- without any proxy running issue script/docker_dev_setup.sh
	verify proxy, web, psql, redis containers are created
	app is ready
	- run script/docker_dev_update.sh
	verify it just works

Change-Id: I5e079289fbcc26bd1bbc9eb2c6ad3d01e14048df
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/381275
Reviewed-by: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Gergely Máté <gergely.mate@instructure.com>
Product-Review: Gergely Máté <gergely.mate@instructure.com>
Build-Review: Gergely Máté <gergely.mate@instructure.com>
2025-06-25 16:53:57 +00:00
741a725f52 update docker-compose to docker compose
[skip-crystalball]
[change-merged]
[build-registry-path=jenkins/canvas-lms/dockercomposeupdate]

Change-Id: Id8dac2c65a5b586fc5e419bbd83ecf565a71e33e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/357959
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Build-Review: James Butters <jbutters@instructure.com>
Reviewed-by: Gergely Máté <gergely.mate@instructure.com>
2024-10-25 13:25:20 +00:00
73a7fb0827 No more mutagen
macOS and docker desktop's support of virtiofs is a better path forward

Test plan:
  - Docker setup script works on MacOS

Closes FOO-2982

Change-Id: Ibb64390420bfa7ade82f00d962282db41917a89a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/294699
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2022-06-27 15:33:24 +00:00
c3f8c1bce2 set IS_MUTAGEN in linux/dev_setup.sh
when mutagen is found to be installed we need to set IS_MUTAGEN
to ensure all other steps are running the correct steps.

flag = none

Test Plan:
-Jenkins passes
-linux with mutagen, run docker_dev_setup.sh with no errors
  -the correct docker-compose.override.yml is copied
-mac, no changes. docker_dev_setup.sh should still work

Change-Id: Ia8111c005a344723d492a15a980770c4a63e2d12
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/290807
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
2022-05-06 14:18:08 +00:00
9d324b8b5a support linux without mutagen docker setup
we should still support a docker dev setup on linux without mutagen.

flag = none

Change-Id: I73874c7f5650070a237e15f5928a0e2886a1b573
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/288913
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Bobby Buten <bobby.buten@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2022-04-05 17:53:32 +00:00
08965f67ca 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>
2022-03-24 19:36:22 +00:00
d8d1078abf update docker_dev scripts to work with latest mutagen release
update docker_dev script to use mutagen 0.13.0, new dependency
mutagen-compose, update commands to use mutagen-compose.

closes: DE-1014
flag = none

Test Plan:
-Jenkins passes
-docker_dev_setup passes with all required dependcies
-with beta version of mutagen
  -docker_dev_setup fails, alerting to missing dependency
-with mutagen 0.13.0, without mutagen-compose
  -docker_dev_setup fails, alerting to missing dependency
-with docker desktop installed to Docker/Desktop.app
  -docker_dev_setup does not fail

Change-Id: I3e18403912ee2a362c306da2df88eb58faa39db1
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/283663
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Isaac Moore <isaac.moore@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2022-01-27 19:57:22 +00:00
e38b3a49be add support for mutagen setup and update.
flag = none
closes: DE-529

Test Plan:
Test All On Linux and Mac
-docker_dev_setup without mutagen
  -test with dinghy not created, down, missing
-docker_dev_setup with mutagen
  -with docker desktop not running
  -with and without dory
-docker_dev_update with and without mutagen
  -with update-code option and without
-update_canvas for local is not broken
-following Next Steps, all works for mutagen

Change-Id: I7690dc2d919cf1b9d8af86200ec8439da9135d16
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/262293
QA-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2021-04-27 19:46:36 +00:00
e58e097d03 modify the directory hierarchy in preparation for mutagen
flag = none
refs: DE-529

Test Plan:
-docker_dev_setup still works on mac and linux
-docker_dev_update still works for mac and linux
-Jenkins docker smoke build passes

Change-Id: I707e272efdefa536c3362142c6233467f464bb54
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/263225
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>
2021-04-20 16:52:26 +00:00