From dee9ecb1435d257b40d1022ebc28d7e850a910fe Mon Sep 17 00:00:00 2001 From: salman2013 Date: Fri, 27 Oct 2023 08:51:41 +0500 Subject: [PATCH 1/3] chore: update bok-choy hostname --- docker-compose-watchers.yml | 4 ++-- docker-compose.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index 0a9da2a88c..915e8e1638 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -5,7 +5,7 @@ services: command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.lms_watcher" environment: - BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher + SERVER_HOSTNAME: edx.devstack.lms_watcher ASSET_WATCHER_TIMEOUT: 12 image: openedx/lms-dev:${OPENEDX_RELEASE:-latest} volumes: @@ -23,7 +23,7 @@ services: command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms_watcher" environment: - BOK_CHOY_HOSTNAME: edx.devstack.cms_watcher + SERVER_HOSTNAME: edx.devstack.cms_watcher ASSET_WATCHER_TIMEOUT: 12 image: openedx/lms-dev:${OPENEDX_RELEASE:-latest} volumes: diff --git a/docker-compose.yml b/docker-compose.yml index f4511cff8b..24d34d4c24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -422,9 +422,9 @@ services: stdin_open: true tty: true environment: - BOK_CHOY_HOSTNAME: edx.devstack.lms - BOK_CHOY_LMS_PORT: 18003 - BOK_CHOY_CMS_PORT: 18031 + SERVER_HOSTNAME: edx.devstack.lms + SERVER_LMS_PORT: 18003 + SERVER_CMS_PORT: 18031 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo NO_PYTHON_UNINSTALL: 1 DJANGO_WATCHMAN_TIMEOUT: 30 @@ -599,9 +599,9 @@ services: stdin_open: true tty: true environment: - BOK_CHOY_HOSTNAME: edx.devstack.cms - BOK_CHOY_LMS_PORT: 18103 - BOK_CHOY_CMS_PORT: 18131 + SERVER_HOSTNAME: edx.devstack.cms + SERVER_LMS_PORT: 18103 + SERVER_CMS_PORT: 18131 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo VIRTUAL_ENV: "/edx/app/edxapp/venvs/edxapp" 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}" From 3ab1803494b5d2b7d95fd5c162f91e2b54a80935 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Mon, 30 Oct 2023 09:41:43 +0500 Subject: [PATCH 2/3] chore: update variable name as per review comment --- docker-compose-watchers.yml | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index 915e8e1638..2b8954afb7 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -5,7 +5,7 @@ services: command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.lms_watcher" environment: - SERVER_HOSTNAME: edx.devstack.lms_watcher + FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms_watcher ASSET_WATCHER_TIMEOUT: 12 image: openedx/lms-dev:${OPENEDX_RELEASE:-latest} volumes: @@ -23,7 +23,7 @@ services: command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms_watcher" environment: - SERVER_HOSTNAME: edx.devstack.cms_watcher + FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms_watcher ASSET_WATCHER_TIMEOUT: 12 image: openedx/lms-dev:${OPENEDX_RELEASE:-latest} volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 24d34d4c24..a22aefb76e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -422,7 +422,7 @@ services: stdin_open: true tty: true environment: - SERVER_HOSTNAME: edx.devstack.lms + FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms SERVER_LMS_PORT: 18003 SERVER_CMS_PORT: 18031 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo @@ -599,7 +599,7 @@ services: stdin_open: true tty: true environment: - SERVER_HOSTNAME: edx.devstack.cms + FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms SERVER_LMS_PORT: 18103 SERVER_CMS_PORT: 18131 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo From 43d203e9d3066aafb8c58d648b3b33a358770c74 Mon Sep 17 00:00:00 2001 From: salman2013 Date: Tue, 31 Oct 2023 15:01:33 +0500 Subject: [PATCH 3/3] chore: update lms, cms port variable name --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a22aefb76e..1a68acd627 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -423,8 +423,8 @@ services: tty: true environment: FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms - SERVER_LMS_PORT: 18003 - SERVER_CMS_PORT: 18031 + FRONTEND_TEST_SERVER_LMS_PORT: 18003 + FRONTEND_TEST_SERVER_CMS_PORT: 18031 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo NO_PYTHON_UNINSTALL: 1 DJANGO_WATCHMAN_TIMEOUT: 30 @@ -600,8 +600,8 @@ services: tty: true environment: FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms - SERVER_LMS_PORT: 18103 - SERVER_CMS_PORT: 18131 + FRONTEND_TEST_SERVER_LMS_PORT: 18103 + FRONTEND_TEST_SERVER_CMS_PORT: 18131 EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo VIRTUAL_ENV: "/edx/app/edxapp/venvs/edxapp" 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}"