From 560f88223c69b5db6d29562217ccfbf12a8f89dd Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 14 Feb 2023 21:22:24 +0500 Subject: [PATCH 1/2] fix: change for using development image for devstack --- Makefile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 48ab63d40e..d4ce4e4441 100644 --- a/Makefile +++ b/Makefile @@ -439,7 +439,7 @@ dev.shell.lms_watcher: docker-compose exec lms_watcher env TERM=$(TERM) /edx/app/edxapp/devstack.sh open 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 diff --git a/docker-compose.yml b/docker-compose.yml index 99c83c082d..4e4e1aba63 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -622,7 +622,7 @@ services: DJANGO_WATCHMAN_TIMEOUT: 30 LMS_CFG: "/edx/etc/lms.yml" CMS_CFG: "/edx/etc/studio.yml" - image: edxops/edxapp:${OPENEDX_RELEASE:-latest} + image: openedx/lms-dev:${OPENEDX_RELEASE:-latest} networks: default: aliases: From 8c87f5153814c4b63ab6205fc730417ed5b80db3 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 20 Feb 2023 15:56:20 +0500 Subject: [PATCH 2/2] fix: studio watcher target has also changed --- Makefile | 2 +- docker-compose-watchers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d4ce4e4441..7a75005eae 100644 --- a/Makefile +++ b/Makefile @@ -442,7 +442,7 @@ dev.shell.studio: 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 diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index 45d3610708..3b8526675f 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -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