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

Commit 3199c8f

Browse files
committed
style: alphabetize service definitions and dependencies
Diffing / spotting issues in repetative config can be difficult. Alphabetization makes it easier.
1 parent eb38c89 commit 3199c8f

6 files changed

Lines changed: 122 additions & 120 deletions

File tree

docker-compose-host-nfs.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,34 +45,34 @@ services:
4545
registrar-worker:
4646
volumes:
4747
- ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
48+
frontend-app-course-authoring:
49+
volumes:
50+
- ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
51+
- frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
4852
frontend-app-gradebook:
4953
volumes:
5054
- ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/frontend-app-gradebook:cached
5155
- frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/node_modules
52-
frontend-app-program-console:
53-
volumes:
54-
- ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
55-
- frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
5656
frontend-app-learning:
5757
volumes:
5858
- ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
5959
- frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
60-
frontend-app-course-authoring:
60+
frontend-app-library-authoring:
6161
volumes:
62-
- ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
63-
- frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
62+
- ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
63+
- frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
6464
frontend-app-payment:
6565
volumes:
6666
- ${DEVSTACK_WORKSPACE}/frontend-app-payment:/edx/app/frontend-app-payment:cached
6767
- frontend_app_payment_node_modules:/edx/app/frontend-app-payment/node_modules
68+
frontend-app-program-console:
69+
volumes:
70+
- ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
71+
- frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
6872
frontend-app-publisher:
6973
volumes:
7074
- ${DEVSTACK_WORKSPACE}/frontend-app-publisher:/edx/app/frontend-app-publisher:cached
7175
- frontend_app_publisher_node_modules:/edx/app/frontend-app-publisher/node_modules
72-
frontend-app-library-authoring:
73-
volumes:
74-
- ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
75-
- frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
7676

7777
volumes:
7878
credentials_node_modules:
@@ -81,13 +81,13 @@ volumes:
8181
edxapp_media:
8282
edxapp_node_modules:
8383
edxapp_uploads:
84+
frontend_app_course_authoring_node_modules:
8485
frontend_app_gradebook_node_modules:
85-
frontend_app_program_console_node_modules:
8686
frontend_app_learning_node_modules:
87+
frontend_app_library_authoring_node_modules:
8788
frontend_app_payment_node_modules:
89+
frontend_app_program_console_node_modules:
8890
frontend_app_publisher_node_modules:
89-
frontend_app_course_authoring_node_modules:
90-
frontend_app_library_authoring_node_modules:
9191
edx-nfs:
9292
driver: local
9393
driver_opts:

docker-compose-host.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ services:
2121
- ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
2222
- ecommerce_tox:/edx/app/ecommerce/ecommerce/.tox
2323
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
24+
forum:
25+
volumes:
26+
- ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
2427
lms:
2528
volumes:
2629
- ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -33,6 +36,12 @@ services:
3336
volumes:
3437
- ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
3538
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
39+
registrar:
40+
volumes:
41+
- ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
42+
registrar-worker:
43+
volumes:
44+
- ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
3645
studio:
3746
volumes:
3847
- ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -41,43 +50,34 @@ services:
4150
- edxapp_tox:/edx/app/edxapp/edx-platform/.tox
4251
- edxapp_uploads:/edx/var/edxapp/uploads
4352
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
44-
forum:
45-
volumes:
46-
- ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
47-
registrar:
48-
volumes:
49-
- ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
50-
registrar-worker:
53+
frontend-app-course-authoring:
5154
volumes:
52-
- ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
55+
- ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
56+
- frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
5357
frontend-app-gradebook:
5458
volumes:
5559
- ${DEVSTACK_WORKSPACE}/frontend-app-gradebook:/edx/app/frontend-app-gradebook:cached
5660
- frontend_app_gradebook_node_modules:/edx/app/frontend-app-gradebook/node_modules
57-
frontend-app-program-console:
61+
frontend-app-learning:
5862
volumes:
59-
- ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
60-
- frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
63+
- ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
64+
- frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
65+
frontend-app-library-authoring:
66+
volumes:
67+
- ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
68+
- frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
6169
frontend-app-payment:
6270
volumes:
6371
- ${DEVSTACK_WORKSPACE}/frontend-app-payment:/edx/app/frontend-app-payment:cached
6472
- frontend_app_payment_node_modules:/edx/app/frontend-app-payment/node_modules
73+
frontend-app-program-console:
74+
volumes:
75+
- ${DEVSTACK_WORKSPACE}/frontend-app-program-console:/edx/app/frontend-app-program-console:cached
76+
- frontend_app_program_console_node_modules:/edx/app/frontend-app-program-console/node_modules
6577
frontend-app-publisher:
6678
volumes:
6779
- ${DEVSTACK_WORKSPACE}/frontend-app-publisher:/edx/app/frontend-app-publisher:cached
6880
- frontend_app_publisher_node_modules:/edx/app/frontend-app-publisher/node_modules
69-
frontend-app-learning:
70-
volumes:
71-
- ${DEVSTACK_WORKSPACE}/frontend-app-learning:/edx/app/frontend-app-learning:cached
72-
- frontend_app_learning_node_modules:/edx/app/frontend-app-learning/node_modules
73-
frontend-app-course-authoring:
74-
volumes:
75-
- ${DEVSTACK_WORKSPACE}/frontend-app-course-authoring:/edx/app/frontend-app-course-authoring:cached
76-
- frontend_app_course_authoring_node_modules:/edx/app/frontend-app-course-authoring/node_modules
77-
frontend-app-library-authoring:
78-
volumes:
79-
- ${DEVSTACK_WORKSPACE}/frontend-app-library-authoring:/edx/app/frontend-app-library-authoring:cached
80-
- frontend_app_library_authoring_node_modules:/edx/app/frontend-app-library-authoring/node_modules
8181

8282
volumes:
8383
credentials_node_modules:
@@ -86,13 +86,13 @@ volumes:
8686
edxapp_media:
8787
edxapp_node_modules:
8888
edxapp_uploads:
89+
frontend_app_course_authoring_node_modules:
8990
frontend_app_gradebook_node_modules:
90-
frontend_app_program_console_node_modules:
91-
frontend_app_payment_node_modules:
92-
frontend_app_publisher_node_modules:
9391
frontend_app_learning_node_modules:
94-
frontend_app_course_authoring_node_modules:
9592
frontend_app_library_authoring_node_modules:
93+
frontend_app_payment_node_modules:
94+
frontend_app_program_console_node_modules:
95+
frontend_app_publisher_node_modules:
9696
credentials_tox:
9797
discovery_tox:
9898
ecommerce_tox:

docker-compose-sync.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ services:
2929
volumes:
3030
- registrar-sync:/edx/app/registrar/registrar:nocopy
3131
- source-sync:/edx/src:nocopy
32-
frontend-app-gradebook:
33-
volumes:
34-
- frontend-app-gradebook-sync:/edx/app/frontend-app-gradebook:nocopy
35-
- source-sync:/edx/src:nocopy
36-
frontend-app-program-console:
37-
volumes:
38-
- frontend-app-program-console-sync:/edx/app/frontend-app-program-console:nocopy
39-
- source-sync:/edx/src:nocopy
4032
frontend-app-course-authoring:
4133
volumes:
4234
- frontend-app-course-authoring-sync:/edx/app/frontend-app-course-authoring:nocopy
4335
- source-sync:/edx/src:nocopy
36+
frontend-app-gradebook:
37+
volumes:
38+
- frontend-app-gradebook-sync:/edx/app/frontend-app-gradebook:nocopy
39+
- source-sync:/edx/src:nocopy
4440
frontend-app-library-authoring:
4541
volumes:
4642
- frontend-app-library-authoring-sync:/edx/app/frontend-app-library-authoring:nocopy
4743
- source-sync:/edx/src:nocopy
44+
frontend-app-program-console:
45+
volumes:
46+
- frontend-app-program-console-sync:/edx/app/frontend-app-program-console:nocopy
47+
- source-sync:/edx/src:nocopy
4848

4949
volumes:
5050
credentials-sync:
@@ -59,13 +59,13 @@ volumes:
5959
external: true
6060
registrar-sync:
6161
external: true
62-
frontend-app-gradebook-sync:
63-
external: true
64-
frontend-app-program-console-sync:
65-
external: true
6662
frontend-app-course-authoring-sync:
6763
external: true
64+
frontend-app-gradebook-sync:
65+
external: true
6866
frontend-app-library-authoring-sync:
6967
external: true
68+
frontend-app-program-console-sync:
69+
external: true
7070
source-sync:
7171
external: true

0 commit comments

Comments
 (0)