Uncomment discovery service

appsembler · Aug 10, 2023 · 54898bf · 54898bf
1 parent e25066d
commit 54898bf
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 <containerID>'.
-  #   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 <containerID>'.
+    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: