feat: add xqueue-config for ansible-free docker image (#1006)

Co-authored-by: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com>

Author: mumarkhan999

Makefile

@@ -438,7 +438,7 @@ dev.shell.registrar:
 	docker-compose exec registrar env TERM=$(TERM) /bin/bash
 
 dev.shell.xqueue:
-	docker-compose exec xqueue env TERM=$(TERM) /edx/app/xqueue/devstack.sh open
+	docker-compose exec xqueue env TERM=$(TERM) /bin/bash
 
 dev.shell.lms:
 	docker-compose exec lms env TERM=$(TERM) bash -c '/bin/bash'
@@ -453,7 +453,7 @@ dev.shell.studio_watcher:
 	docker-compose exec studio_watcher env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.xqueue_consumer:
-	docker-compose exec xqueue_consumer env TERM=$(TERM) /edx/app/xqueue/devstack.sh open
+	docker-compose exec xqueue_consumer env TERM=$(TERM) /bin/bash
 
 dev.shell.analyticsapi:
 	docker exec -it edx.devstack.analyticsapi env TERM=$(TERM) bash -c '/bin/bash'
@@ -633,4 +633,3 @@ build-courses: ## Build course and provision studio, and ecommerce with it.
 	$(WINPTY) bash ./course-generator/build-course-json.sh course-generator/tmp-config.json
 	$(WINPTY) bash ./course-generator/create-courses.sh --studio --ecommerce course-generator/tmp-config.json
 	rm course-generator/tmp-config.json
-

configuration_files/xqueue.yml

@@ -0,0 +1,34 @@
+CONSUMER_DELAY: 10
+CSRF_COOKIE_SECURE: false
+DATABASES:
+    default:
+        ATOMIC_REQUESTS: true
+        CONN_MAX_AGE: 0
+        ENGINE: django.db.backends.mysql
+        HOST: edx.devstack.mysql57
+        NAME: xqueue
+        OPTIONS: {}
+        PASSWORD: password
+        PORT: '3306'
+        USER: xqueue001
+LOCAL_LOGLEVEL: INFO
+LOGGING_ENV: sandbox
+LOG_DIR: /edx/var/logs/xqueue
+NEWRELIC_APPNAME: default_env-default_deployment-xqueue
+NEWRELIC_LICENSE_KEY: ''
+REQUESTS_BASIC_AUTH:
+- edx
+- edx
+SESSION_COOKIE_SECURE: false
+SUBMISSION_PROCESSING_DELAY: 1
+SYSLOG_SERVER: localhost
+UPLOAD_BUCKET: sandbox-bucket
+UPLOAD_PATH_PREFIX: sandbox-xqueue
+USERS:
+    lms: password
+XQUEUES:
+    certificates: null
+    edX-Open_DemoX: http://localhost:18050
+    open-ended: null
+    open-ended-message: null
+    test-pull: null

docker-compose.yml

@@ -645,12 +645,16 @@ services:
 
   xqueue:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.xqueue"
-    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
+    image: edxops/xqueue-dev:${OPENEDX_RELEASE:-latest}
+    working_dir: /edx/app/xqueue/xqueue
     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
+      - ${PWD}/configuration_files/xqueue.yml:/edx/etc/xqueue.yml
     depends_on:
       - mysql57
+    environment:
+      XQUEUE_CFG: "/edx/etc/xqueue.yml"
     networks:
       default:
         aliases:
@@ -660,10 +664,12 @@ services:
 
   xqueue_consumer:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.xqueue_consumer"
-    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
+    image: edxops/xqueue-dev:${OPENEDX_RELEASE:-latest}
+    working_dir: /edx/app/xqueue/xqueue
     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
+      - ${PWD}/configuration_files/xqueue.yml:/edx/etc/xqueue.yml
     depends_on:
       - mysql57
     networks: