refactor: pull xqueue service def into main docker-compose.yml

It was once separated out because the idea of DEFAULT_SERVICES
and a generalized `dev.up.*` command hadn't been developed, so
everything in docker-compose.yml was always started. This is no
longer the case (the Registrar extra service exists in
docker-compose.yml yet isn't started by default).
So, the separation of docker-compose-xqueue.yml is just confusing.

Furthermore, by pulling xqueue and xqueue_consumer into
docker-compose.yml, we can properly define mysql57 as its
dependency.

Author: kdmccormick

Makefile

@@ -81,7 +81,6 @@ ifeq ($(FS_SYNC_STRATEGY),local-mounts)
 COMPOSE_FILE := docker-compose-host.yml
 COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-themes.yml
 COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-watchers.yml
-COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-xqueue.yml
 endif
 
 # Files for use with Network File System -based synchronization.

docker-compose-xqueue.yml

@@ -458,6 +458,34 @@ services:
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
 
+  xqueue:
+    container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.xqueue"
+    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
+    command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py runserver 0.0.0.0:18040 ; sleep 2; done'
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
+    depends_on:
+      - mysql57
+    networks:
+      default:
+        aliases:
+          - edx.devstack.xqueue
+    ports:
+      - 18040:18040
+
+  xqueue_consumer:
+    container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.xqueue_consumer"
+    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
+    command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py run_consumer ; sleep 2; done'
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
+    depends_on:
+      - mysql57
+    networks:
+      default:
+        aliases:
+          - edx.devstack.xqueue_consumer
+
   # ==========================================================================
   # edX Microfrontends
   #