Target changed to dev image for devstack for LMS & Studio (#1018)

* feat: target  dev image changed for LMS and Studio

* fix: env variables updated for lms and cms

* fix: rollback pip.txt changes

* fix: lms_watcher target updated

Author: zubairshakoorarbisoft

Makefile

@@ -439,16 +439,16 @@ dev.shell.xqueue:
 	docker-compose exec xqueue env TERM=$(TERM) /edx/app/xqueue/devstack.sh open
 
 dev.shell.lms:
-	docker-compose exec lms env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	docker-compose exec lms env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.lms_watcher:
-	docker-compose exec lms_watcher env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	docker-compose exec lms_watcher env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.studio:
-	docker-compose exec studio env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	docker-compose exec studio env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.studio_watcher:
-	docker-compose exec studio_watcher env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	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-watchers.yml

@@ -7,7 +7,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -25,7 +25,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform

docker-compose.yml

@@ -454,7 +454,9 @@ services:
       LMS_CFG: "/edx/etc/lms.yml"
       CMS_CFG: "/edx/etc/studio.yml"
       PATH: "/edx/app/edxapp/venvs/edxapp/bin:/edx/app/edxapp/nodeenv/bin:/edx/app/edxapp/edx-platform/node_modules/.bin:/edx/app/edxapp/edx-platform/bin:${PATH}"
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+      DJANGO_SETTINGS_MODULE: lms.envs.devstack_docker
+      SERVICE_VARIANT: lms
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     networks:
       default:
         aliases:
@@ -622,7 +624,9 @@ services:
       DJANGO_WATCHMAN_TIMEOUT: 30
       LMS_CFG: "/edx/etc/lms.yml"
       CMS_CFG: "/edx/etc/studio.yml"
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+      DJANGO_SETTINGS_MODULE: cms.envs.devstack_docker
+      SERVICE_VARIANT: cms
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     networks:
       default:
         aliases: