From 9ca851bdfc85018e96f9b7f4d4a3c998da4ddd0e Mon Sep 17 00:00:00 2001
From: Zachary Trabookis <ztraboo@clemson.edu>
Date: Mon, 27 Jul 2020 13:48:19 -0400
Subject: [PATCH] Update `docker` commands to be `docker-compose` to handle
 unnamed containers 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 https://github.com/edx/devstack/pull/532/commits/59f812eed18e33f15c1616a0e2176d0aff079d26
---
 Makefile.edx                | 4 ++--
 docker-compose-watchers.yml | 8 ++++++++
 docker-compose.yml          | 4 ++++
 upgrade_mongo_4_0.sh        | 2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile.edx b/Makefile.edx
index 99c3f31902..037f1003ac 100644
--- a/Makefile.edx
+++ b/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
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 45d3610708..f9872dc327 100644
--- a/docker-compose-watchers.yml
+++ b/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
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d5c39f152..af7e024fce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -239,6 +239,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:
diff --git a/upgrade_mongo_4_0.sh b/upgrade_mongo_4_0.sh
index 0409d03698..cabc00d9b9 100755
--- a/upgrade_mongo_4_0.sh
+++ b/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