From 54898bffb5d97f1f126e89ebe77bb4e76d3ec985 Mon Sep 17 00:00:00 2001 From: Bryan Wilson Date: Wed, 9 Aug 2023 17:13:11 -0700 Subject: [PATCH] Uncomment discovery service --- docker-compose-host.yml | 10 ++++---- docker-compose-sync.yml | 6 ++--- docker-compose-themes.yml | 6 ++--- docker-compose.yml | 50 +++++++++++++++++++-------------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docker-compose-host.yml b/docker-compose-host.yml index 8a74a9c2f5..0ce6bddd44 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -8,11 +8,11 @@ services: - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:${DEVSTACK_CACHE:-cached} - credentials_node_modules:/edx/app/credentials/credentials/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:${DEVSTACK_CACHE:-cached} -# discovery: # Appsembler: Commented out to make a lighter devstack. -# volumes: -# - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:${DEVSTACK_CACHE:-cached} -# - discovery_node_modules:/edx/app/discovery/discovery/node_modules -# - ${DEVSTACK_WORKSPACE}/src:/edx/src:${DEVSTACK_CACHE:-cached} + discovery: # Appsembler: normally Commented out to make a lighter devstack. + volumes: + - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:${DEVSTACK_CACHE:-cached} + - discovery_node_modules:/edx/app/discovery/discovery/node_modules + - ${DEVSTACK_WORKSPACE}/src:/edx/src:${DEVSTACK_CACHE:-cached} # ecommerce: # Appsembler: Commented out to make a lighter devstack. # volumes: # - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:${DEVSTACK_CACHE:-cached} diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml index a71158f426..59b8567b7c 100644 --- a/docker-compose-sync.yml +++ b/docker-compose-sync.yml @@ -4,9 +4,9 @@ services: credentials: volumes: - credentials-sync:/edx/app/credentials/credentials:nocopy -# discovery: # Appsembler: Commented out to make a lighter devstack. -# volumes: -# - discovery-sync:/edx/app/discovery/discovery:nocopy + discovery: # Appsembler: normally Commented out to make a lighter devstack. + volumes: + - discovery-sync:/edx/app/discovery/discovery:nocopy # ecommerce: # Appsembler: Commented out to make a lighter devstack. # volumes: # - ecommerce-sync:/edx/app/ecommerce/ecommerce:nocopy diff --git a/docker-compose-themes.yml b/docker-compose-themes.yml index 56c991c38f..f8e0b80a60 100644 --- a/docker-compose-themes.yml +++ b/docker-compose-themes.yml @@ -1,9 +1,9 @@ version: "2.1" services: -# discovery: # Appsembler: Commented out to make a lighter devstack. -# volumes: -# - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached + discovery: # Appsembler: normally Commented out to make a lighter devstack. + volumes: + - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached # ecommerce: # Appsembler: Commented out to make a lighter devstack. # volumes: # - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached diff --git a/docker-compose.yml b/docker-compose.yml index 1c0a08547d..b1c5f71cfe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -186,30 +186,30 @@ services: ports: - "18150:18150" - # discovery: # Appsembler: Commented out to make a lighter devstack. - # command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done' - # container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.discovery" - # hostname: discovery.devstack.edx - # depends_on: - # - mysql - # - elasticsearch - # - memcached - # # Allows attachment to the discovery service using 'docker attach '. - # stdin_open: true - # tty: true - # environment: - # TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200" - # ENABLE_DJANGO_TOOLBAR: 1 - # DJANGO_WATCHMAN_TIMEOUT: 30 - # image: edxops/discovery:${OPENEDX_RELEASE:-latest} - # networks: - # default: - # aliases: - # - edx.devstack.discovery - # ports: - # - "18381:18381" - # volumes: - # - discovery_assets:/edx/var/discovery/ + discovery: # Appsembler: normally Commented out to make a lighter devstack. + command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done' + container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.discovery" + hostname: discovery.devstack.edx + depends_on: + - mysql + - elasticsearch + - memcached + # Allows attachment to the discovery service using 'docker attach '. + stdin_open: true + tty: true + environment: + TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200" + ENABLE_DJANGO_TOOLBAR: 1 + DJANGO_WATCHMAN_TIMEOUT: 30 + image: edxops/discovery:${OPENEDX_RELEASE:-latest} + networks: + default: + aliases: + - edx.devstack.discovery + ports: + - "18381:18381" + volumes: + - discovery_assets:/edx/var/discovery/ # ecommerce: # Appsembler: Commented out to make a lighter devstack. # command: bash -c 'source /edx/app/ecommerce/ecommerce_env && while true; do python /edx/app/ecommerce/ecommerce/manage.py runserver 0.0.0.0:18130; sleep 2; done' @@ -572,7 +572,7 @@ services: - fa_config:/usr/local/fusionauth/config volumes: -# discovery_assets: # Appsembler: Commented out to make a lighter devstack. + discovery_assets: # Appsembler: normally Commented out to make a lighter devstack. edxapp_lms_assets: edxapp_studio_assets: elasticsearch_data: