Update docker commands to be docker-compose to handle unnamed con…

…tainers for multi-version devstack support

https://discuss.openedx.org/t/docker-devstack-multiple-releases-one-machine/1902
Multiple devstack releases with one machine.

This is in regards to this pull request
https://github.com/edx/devstack/pull/532
Updating volumes for `themes` to work with the `ironwood` release.

Applying these changes to get local devstack working for ironwood release.

https://github.com/edx/devstack/pull/376
https://github.com/edx/devstack/pull/377
Moved `COMPOSE_PROJECT_NAME` update to `options.mk` file.

Additional changes to get `devstack_docker` for Ironwood working multisite environment setup.

Additional changes needed to make `docker` commands work making use of the `dev.print-container.%` target to get the container id.

Reverting some of these commands back to `docker` type to align with what we did with edx@59f812e

Makefile.edx

@@ -28,7 +28,7 @@ whitelabel-tests:
 	docker exec -t devstack.whitelabel env TEST_ENV=devstack TERM=$(TERM) bash /tmp/run_whitelabel_tests.sh
 
 whitelabel-cleanup:
-	docker rm --force devstack.whitelabel
+	docker-compose rm --force devstack.whitelabel
 
 whitelabel-shell: ## Start a whitelabel test shell session
-	docker exec -it devstack.whitelabel env TERM=$(TERM) bash
+	docker-compose exec -it devstack.whitelabel env TERM=$(TERM) bash

docker-compose-watchers.yml

@@ -8,6 +8,10 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
     image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    networks:
+      default:
+        aliases:
+          - edx.devstack.lms_watcher
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -26,6 +30,10 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
     image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    networks:
+      default:
+        aliases:
+          - edx.devstack.studio_watcher
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform

docker-compose.yml

@@ -182,6 +182,10 @@ services:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.redis"
     hostname: redis.devstack.edx
     image: redis:2.8
+    networks:
+      default:
+        aliases:
+          - edx.devstack.redis
     command: redis-server --requirepass password
     networks:
       default:

upgrade_mongo_4_0.sh

@@ -78,6 +78,8 @@ echo -e "${GREEN}Restarting Mongo on version ${MONGO_VERSION}${NC}"
 make dev.up.mongo
 mongo_container="$(make --silent --no-print-directory dev.print-container.mongo)"
 
+mongo_container="$(make -s dev.print-container.mongo)"
+
 echo -e "${GREEN}Waiting for MongoDB...${NC}"
 until docker exec "$mongo_container" mongo --eval 'db.serverStatus()' &> /dev/null
 do