feat: mount src/ into /edx/src of frontend containers

Makefile

@@ -81,7 +81,6 @@ ifeq ($(FS_SYNC_STRATEGY),local-mounts)
 COMPOSE_FILE := docker-compose-host.yml
 COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-themes.yml
 COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-watchers.yml
-COMPOSE_FILE := $(COMPOSE_FILE):docker-compose-xqueue.yml
 endif
 
 # Files for use with Network File System -based synchronization.

README.rst

@@ -329,15 +329,15 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
 +------------------------------------+-------------------------------------+----------------+--------------+
 | `frontend-app-publisher`_          | http://localhost:18400/             | MFE (React.js) | Default      |
 +------------------------------------+-------------------------------------+----------------+--------------+
-| `gradebook`_                       | http://localhost:1994/              | MFE (React.js) | Default      |
+| `frontend-app-gradebook`_          | http://localhost:1994/              | MFE (React.js) | Default      |
 +------------------------------------+-------------------------------------+----------------+--------------+
-| `registrar`_                       | http://localhost:18734/api-docs/    | Python/Django  | Extra        |
+| `frontend-app-library-authoring`_  | http://localhost:3001/              | MFE (React.js) | Default      |
 +------------------------------------+-------------------------------------+----------------+--------------+
-| `program-console`_                 | http://localhost:1976/              | MFE (React.js) | Extra        |
+| `frontend-app-course-authoring`_   | http://localhost:2001/              | MFE (React.js) | Default      |
 +------------------------------------+-------------------------------------+----------------+--------------+
-| `frontend-app-library-authoring`_  | http://localhost:3001/              | MFE (React.js) | Extra        |
+| `frontend-app-program-console`_    | http://localhost:1976/              | MFE (React.js) | Extra        |
 +------------------------------------+-------------------------------------+----------------+--------------+
-| `course-authoring`_                | http://localhost:2001/              | MFE (React.js) | Extra        |
+| `registrar`_                       | http://localhost:18734/api-docs/    | Python/Django  | Extra        |
 +------------------------------------+-------------------------------------+----------------+--------------+
 | `xqueue`_                          | http://localhost:18040/api/v1/      | Python/Django  | Extra        |
 +------------------------------------+-------------------------------------+----------------+--------------+
@@ -355,15 +355,15 @@ Some common service combinations include:
 .. _forum: https://github.com/edx/cs_comments_service
 .. _frontend-app-payment: https://github.com/edx/frontend-app-payment
 .. _frontend-app-publisher: https://github.com/edx/frontend-app-publisher
-.. _gradebook: https://github.com/edx/frontend-app-gradebook
+.. _frontend-app-gradebook: https://github.com/edx/frontend-app-gradebook
 .. _lms: https://github.com/edx/edx-platform
-.. _program-console: https://github.com/edx/frontend-app-program-console
+.. _frontend-app-program-console: https://github.com/edx/frontend-app-program-console
 .. _registrar: https://github.com/edx/registrar
 .. _studio: https://github.com/edx/edx-platform
 .. _lms: https://github.com/edx/edx-platform
 .. _frontend-app-learning: https://github.com/edx/frontend-app-learning
 .. _frontend-app-library-authoring: https://github.com/edx/frontend-app-library-authoring
-.. _course-authoring: https://github.com/edx/frontend-app-course-authoring
+.. _frontend-app-course-authoring: https://github.com/edx/frontend-app-course-authoring
 .. _xqueue: https://github.com/edx/xqueue
 
 

docker-compose-host-nfs.yml

@@ -45,34 +45,34 @@ services:
   registrar-worker:
     volumes:
       - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
-  gradebook:
+  frontend-app-course-authoring:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/gradebook:cached
-      - gradebook_node_modules:/edx/app/gradebook/node_modules
-  program-console:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
+      - frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
+  frontend-app-gradebook:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/program-console:cached
-      - program_console_node_modules:/edx/app/program-console/node_modules
+      - ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/frontend-app-gradebook:cached
+      - frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/node_modules
   frontend-app-learning:
     volumes:
       - ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
       - frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
-  course-authoring:
+  frontend-app-library-authoring:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
-      - course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
+      - ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
+      - frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
   frontend-app-payment:
     volumes:
       - ${DEVSTACK_WORKSPACE}/frontend-app-payment:/edx/app/frontend-app-payment:cached
       - frontend_app_payment_node_modules:/edx/app/frontend-app-payment/node_modules
+  frontend-app-program-console:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
+      - frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
   frontend-app-publisher:
     volumes:
       - ${DEVSTACK_WORKSPACE}/frontend-app-publisher:/edx/app/frontend-app-publisher:cached
       - frontend_app_publisher_node_modules:/edx/app/frontend-app-publisher/node_modules
-  frontend-app-library-authoring:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
-      - frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
 
 volumes:
   credentials_node_modules:
@@ -81,13 +81,13 @@ volumes:
   edxapp_media:
   edxapp_node_modules:
   edxapp_uploads:
-  gradebook_node_modules:
-  program_console_node_modules:
+  frontend_app_course_authoring_node_modules:
+  frontend_app_gradebook_node_modules:
   frontend_app_learning_node_modules:
+  frontend_app_library_authoring_node_modules:
   frontend_app_payment_node_modules:
+  frontend_app_program_console_node_modules:
   frontend_app_publisher_node_modules:
-  course_authoring_node_modules:
-  frontend_app_library_authoring_node_modules:
   edx-nfs:
     driver: local
     driver_opts:

docker-compose-host.yml

@@ -21,6 +21,9 @@ services:
       - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
       - ecommerce_tox:/edx/app/ecommerce/ecommerce/.tox
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  forum:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
   lms:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -33,6 +36,12 @@ services:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  registrar:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
+  registrar-worker:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
   studio:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -41,45 +50,41 @@ services:
       - edxapp_tox:/edx/app/edxapp/edx-platform/.tox
       - edxapp_uploads:/edx/var/edxapp/uploads
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  forum:
+  frontend-app-course-authoring:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  registrar:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
-  registrar-worker:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
+      - frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  frontend-app-gradebook:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
-  gradebook:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/frontend-app-gradebook:cached
+      - frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  frontend-app-learning:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/gradebook:cached
-      - gradebook_node_modules:/edx/app/gradebook/node_modules
-      - gradebook_tox:/edx/app/gradebook/.tox
-  program-console:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
+      - frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  frontend-app-library-authoring:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/program-console:cached
-      - program_console_node_modules:/edx/app/program-console/node_modules
-      - program_console_tox:/edx/app/program-console/.tox
+      - ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
+      - frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   frontend-app-payment:
     volumes:
       - ${DEVSTACK_WORKSPACE}/frontend-app-payment:/edx/app/frontend-app-payment:cached
       - frontend_app_payment_node_modules:/edx/app/frontend-app-payment/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+  frontend-app-program-console:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
+      - frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   frontend-app-publisher:
     volumes:
       - ${DEVSTACK_WORKSPACE}/frontend-app-publisher:/edx/app/frontend-app-publisher:cached
       - frontend_app_publisher_node_modules:/edx/app/frontend-app-publisher/node_modules
-  frontend-app-learning:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
-      - frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
-  course-authoring:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
-      - course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
-  frontend-app-library-authoring:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
-      - frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
 
 volumes:
   credentials_node_modules:
@@ -88,16 +93,14 @@ volumes:
   edxapp_media:
   edxapp_node_modules:
   edxapp_uploads:
-  gradebook_node_modules:
-  program_console_node_modules:
-  frontend_app_payment_node_modules:
-  frontend_app_publisher_node_modules:
+  frontend_app_course_authoring_node_modules:
+  frontend_app_gradebook_node_modules:
   frontend_app_learning_node_modules:
-  course_authoring_node_modules:
   frontend_app_library_authoring_node_modules:
+  frontend_app_payment_node_modules:
+  frontend_app_program_console_node_modules:
+  frontend_app_publisher_node_modules:
   credentials_tox:
   discovery_tox:
   ecommerce_tox:
   edxapp_tox:
-  gradebook_tox:
-  program_console_tox:

docker-compose-sync.yml

@@ -29,22 +29,22 @@ services:
     volumes:
       - registrar-sync:/edx/app/registrar/registrar:nocopy
       - source-sync:/edx/src:nocopy
-  gradebook:
+  frontend-app-course-authoring:
     volumes:
-      - gradebook-sync:/edx/app/gradebook/gradebook:nocopy
+      - frontend-app-course-authoring-sync:/edx/app/frontend-app-course-authoring:nocopy
       - source-sync:/edx/src:nocopy
-  program-console:
+  frontend-app-gradebook:
     volumes:
-      - program-console-sync:/edx/app/program-console:nocopy
-      - source-sync:/edx/src:nocopy
-  course-authoring:
-    volumes:
-      - course-authoring-sync:/edx/app/frontend-app-course-authoring:nocopy
+      - frontend-app-gradebook-sync:/edx/app/frontend-app-gradebook:nocopy
       - source-sync:/edx/src:nocopy
   frontend-app-library-authoring:
     volumes:
       - frontend-app-library-authoring-sync:/edx/app/frontend-app-library-authoring:nocopy
       - source-sync:/edx/src:nocopy
+  frontend-app-program-console:
+    volumes:
+      - frontend-app-program-console-sync:/edx/app/frontend-app-program-console:nocopy
+      - source-sync:/edx/src:nocopy
 
 volumes:
   credentials-sync:
@@ -59,13 +59,13 @@ volumes:
     external: true
   registrar-sync:
     external: true
-  gradebook-sync:
-    external: true
-  program-console-sync:
+  frontend-app-course-authoring-sync:
     external: true
-  course-authoring-sync:
+  frontend-app-gradebook-sync:
     external: true
   frontend-app-library-authoring-sync:
     external: true
+  frontend-app-program-console-sync:
+    external: true
   source-sync:
       external: true