Rename compose-host to compose.override

Follow the Docker community convention: https://docs.docker.com/compose/extends/

Makefile

@@ -20,12 +20,12 @@ dev.clone: ## Clone service repos to the parent directory
 	./clone.sh
 
 dev.provision.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision.sh
+	./provision.sh
 
 dev.provision: | check-memory dev.provision.run stop ## Provision dev environment with all services stopped
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
+	docker-compose up -d
 
 dev.sync.daemon.start: ## Start the docker-sycn daemon
 	docker-sync start

docs/pycharm_integration.rst

@@ -51,7 +51,7 @@ use the following options:
   - Without Docker Sync
 
     - ``/LOCAL/PATH/TO/devstack/docker-compose.yml`` (e.g.~/edx/devstack/docker-compose.yml)
-    - ``/LOCAL/PATH/TO/devstack/docker-compose-host.yml``
+    - ``/LOCAL/PATH/TO/devstack/docker-compose.override.yml``
 
 - Service: lms (or whatever IDE you wish to test)
 

marketing.mk

@@ -2,10 +2,10 @@ marketing-shell: ## Run a shell on the marketing site container
 	docker exec -it edx.devstack.marketing env TERM=$(TERM) bash
 
 up-marketing:   ## Bring up all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
+	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
 
 up-marketing-detached:   ## Bring up all services (including the marketing site) with host volumes (in detached mode)
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
 
 up-marketing-sync:  ## Bring up all services (including the marketing site) with docker-sync
 	docker-sync-stack start -c docker-sync-marketing-site.yml