style: alphabetize service definitions and dependencies

Diffing / spotting issues in repetative config can be difficult. Alphabetization makes it easier.
teltek · Aug 3, 2021 · 3199c8f · 3199c8f
1 parent eb38c89
commit 3199c8f
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 120 deletions.
diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
@@ -45,34 +45,34 @@ services:
   registrar-worker:
     volumes:
       - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
+  frontend-app-course-authoring:
+    volumes:
+      - ${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-gradebook:/edx/app/frontend-app-gradebook:cached
       - frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/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-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
-  frontend-app-course-authoring:
+  frontend-app-library-authoring:
     volumes:
-      - ${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}/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:
+  frontend_app_course_authoring_node_modules:
   frontend_app_gradebook_node_modules:
-  frontend_app_program_console_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:
-  frontend_app_course_authoring_node_modules:
-  frontend_app_library_authoring_node_modules:
   edx-nfs:
     driver: local
     driver_opts:

diff --git a/docker-compose-host.yml b/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,43 +50,34 @@ services:
       - edxapp_tox:/edx/app/edxapp/edx-platform/.tox
       - edxapp_uploads:/edx/var/edxapp/uploads
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  forum:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  registrar:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
-  registrar-worker:
+  frontend-app-course-authoring:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
+      - ${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-gradebook:/edx/app/frontend-app-gradebook:cached
       - frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/node_modules
-  frontend-app-program-console:
+  frontend-app-learning:
     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}/frontend-app-learning:/edx/app/frontend-app-learning:cached
+      - frontend_app_learning_node_modules:/edx/app/frontend-app-learning/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
   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-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
-  frontend-app-course-authoring:
-    volumes:
-      - ${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-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:
@@ -86,13 +86,13 @@ volumes:
   edxapp_media:
   edxapp_node_modules:
   edxapp_uploads:
+  frontend_app_course_authoring_node_modules:
   frontend_app_gradebook_node_modules:
-  frontend_app_program_console_node_modules:
-  frontend_app_payment_node_modules:
-  frontend_app_publisher_node_modules:
   frontend_app_learning_node_modules:
-  frontend_app_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:

diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml
@@ -29,22 +29,22 @@ services:
     volumes:
       - registrar-sync:/edx/app/registrar/registrar:nocopy
       - source-sync:/edx/src:nocopy
-  frontend-app-gradebook:
-    volumes:
-      - frontend-app-gradebook-sync:/edx/app/frontend-app-gradebook: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
   frontend-app-course-authoring:
     volumes:
       - frontend-app-course-authoring-sync:/edx/app/frontend-app-course-authoring:nocopy
       - source-sync:/edx/src:nocopy
+  frontend-app-gradebook:
+    volumes:
+      - 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
-  frontend-app-gradebook-sync:
-    external: true
-  frontend-app-program-console-sync:
-    external: true
   frontend-app-course-authoring-sync:
     external: true
+  frontend-app-gradebook-sync:
+    external: true
   frontend-app-library-authoring-sync:
     external: true
+  frontend-app-program-console-sync:
+    external: true
   source-sync:
       external: true