From 5a698b1f06c23be9ac3bd9c3565dd2d278f04685 Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Tue, 18 Dec 2018 14:00:14 -0500 Subject: [PATCH 1/5] FEDX-507 Fix issue with watcher assets for LMS and Studio services. --- docker-compose-watchers.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index aedd8fd710..140ef41e6d 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -11,6 +11,7 @@ services: volumes: - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached - edxapp_lms_assets:/edx/var/edxapp/staticfiles/ + - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached studio_watcher: @@ -23,8 +24,10 @@ services: volumes: - edxapp_studio_assets:/edx/var/edxapp/staticfiles/ - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached + - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached volumes: edxapp_lms_assets: edxapp_studio_assets: + edxapp_node_modules: From 1da7cace394f8f56aaa6fc95ef06da04958d2a14 Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Tue, 18 Dec 2018 15:31:31 -0500 Subject: [PATCH 2/5] Initialize comprehensive theming volumes for devstack_docker services to also include watchers. --- Makefile | 2 +- docker-compose-watchers.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1abb70edb..9845f05060 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work ./repo.sh reset dev.up: | check-memory ## Bring up all services with host volumes - docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d + bash -c 'docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d' @# Comment out this next line if you want to save some time and don't care about catalog programs ./programs/provision.sh cache >/dev/null diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index 140ef41e6d..7c7828f701 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -13,6 +13,7 @@ services: - edxapp_lms_assets:/edx/var/edxapp/staticfiles/ - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached + - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached studio_watcher: command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' @@ -26,6 +27,7 @@ services: - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached + - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached volumes: edxapp_lms_assets: From d3599f63cc5430095f728ecd11e976e8baedbdd0 Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Thu, 14 Feb 2019 15:43:50 -0500 Subject: [PATCH 3/5] Added some comprehensive theming support for devstack_docker and --- Makefile | 8 ++++---- docker-compose-themes-watchers.yml | 9 +++++++++ docker-compose-watchers.yml | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 docker-compose-themes-watchers.yml diff --git a/Makefile b/Makefile index 9845f05060..2153c0d246 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ dev.up: | check-memory ## Bring up all services with host volumes ./programs/provision.sh cache >/dev/null dev.up.watchers: | check-memory ## Bring up asset watcher containers - docker-compose -f docker-compose-watchers.yml up -d + docker-compose -f docker-compose-watchers.yml -f docker-compose-themes-watchers.yml up -d dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml up -d @@ -200,10 +200,10 @@ xqueue_consumer-restart: ## Kill the XQueue development server. The watcher proc docker exec -t edx.devstack.$* bash -c 'source /edx/app/$*/$*_env && cd /edx/app/$*/$*/ && make static' lms-static: ## Rebuild static assets for the LMS container - docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets' + docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes educateworkforce greermade' -studio-static: ## Rebuild static assets for the Studio container - docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets' +studio-static: ## Rebuild static assets for the Studio container (educateworkforce,arm,belizeproject,bmw,caregiver,dlsc,greermade,mahcc,meep,nccte,nwgrc,ptc,scelect,scjru,ts) + docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes educateworkforce greermade' static: | credentials-static discovery-static ecommerce-static lms-static studio-static ## Rebuild static assets for all service containers diff --git a/docker-compose-themes-watchers.yml b/docker-compose-themes-watchers.yml new file mode 100644 index 0000000000..e8fbb66074 --- /dev/null +++ b/docker-compose-themes-watchers.yml @@ -0,0 +1,9 @@ +version: "2.1" + +services: + lms_watcher: + volumes: + - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached + studio_watcher: + volumes: + - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml index 7c7828f701..0f55930d19 100644 --- a/docker-compose-watchers.yml +++ b/docker-compose-watchers.yml @@ -2,7 +2,7 @@ version: "2.1" services: lms_watcher: - command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' + command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes=educateworkforce,greermade; sleep 2; done' container_name: edx.devstack.lms_watcher environment: BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher @@ -16,7 +16,7 @@ services: - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached studio_watcher: - command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done' + command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT --theme-dirs=/edx/app/edx-themes/edx-platform/ --themes=educateworkforce,greermade; sleep 2; done' container_name: edx.devstack.studio_watcher environment: BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher From 5db42a9fb15e86f8217ade85086a5de6706597fe Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Thu, 14 Feb 2019 15:44:24 -0500 Subject: [PATCH 4/5] Setup local access to MySQL server for database client to connect. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2c496de921..027bac2e94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,8 +68,8 @@ services: MYSQL_ROOT_PASSWORD: "" MYSQL_ALLOW_EMPTY_PASSWORD: "yes" image: mysql:5.6 - # ports: - # - "3306:3306" + ports: + - "33060:3306" volumes: - mysql_data:/var/lib/mysql From 3f4041d33b67d63d40fc378dff84975283e9df38 Mon Sep 17 00:00:00 2001 From: Zachary Trabookis Date: Fri, 26 Apr 2019 15:45:37 -0400 Subject: [PATCH 5/5] Added uploads directory for LMS to use for badge images. EW-404 --- docker-compose-host.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-host.yml b/docker-compose-host.yml index cf848e98eb..637ac290aa 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -21,6 +21,7 @@ services: - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached + - ${DEVSTACK_WORKSPACE}/edx-var-edxapp-uploads:/edx/var/edxapp/uploads:cached edx_notes_api: volumes: - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached