Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

chore: update bok-choy hostname #1217

Merged
merged 4 commits into from
Oct 31, 2023
Merged

chore: update bok-choy hostname #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dee9ecb
chore: update bok-choy hostname
salman2013 Oct 27, 2023
3ab1803
chore: update variable name as per review comment
salman2013 Oct 30, 2023
a9a733e
Merge remote-tracking branch 'upstream/master' into salman/update-bok…
salman2013 Oct 31, 2023
43d203e
chore: update lms, cms port variable name
salman2013 Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose-watchers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms_watcher
ASSET_WATCHER_TIMEOUT: 12
image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
volumes:
Expand All @@ -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
FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms_watcher
ASSET_WATCHER_TIMEOUT: 12
image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
volumes:
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.lms
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
Expand Down Expand Up @@ -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
FRONTEND_TEST_SERVER_HOSTNAME: edx.devstack.cms
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}"
Expand Down