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

Initialize comprehensive theming volumes for devstack_docker services… #377

Merged
jmbowman merged 3 commits into from
Jun 6, 2019
Merged

Initialize comprehensive theming volumes for devstack_docker services… #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
391a6b3
Initialize comprehensive theming volumes for devstack_docker services…
ztraboo Dec 18, 2018
fb02489
Merge remote-tracking branch 'origin/master' into ztraboo/Comprehensi…
ztraboo Jun 6, 2019
3d74e38
Initialize comprehensive theming volumes for devstack_docker services…
ztraboo Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dev.clone: ## Clone service repos to the parent directory
./repo.sh clone

dev.provision.run: ## Provision all services with local mounted directories
DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" $(WINPTY) bash ./provision.sh
DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml" $(WINPTY) bash ./provision.sh

dev.provision: | check-memory dev.clone dev.provision.run stop ## Provision dev environment with all services stopped

Expand All @@ -72,20 +72,20 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
$(WINPTY) bash ./repo.sh reset

dev.up: | check-memory ## Bring up all services with host volumes
bash -c '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'

@jmbowman jmbowman Jun 4, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we add this here, it seems like it should also be added to each of the commands in this file that use -f docker-compose-host.yml (especially dev.provision.run and dev.up.%). Probably in destroy.sh and marketing.mk also.

@# Comment out this next line if you want to save some time and don't care about catalog programs
$(WINPTY) bash ./programs/provision.sh cache $(DEVNULL)

dev.up.%: | check-memory ## Bring up a specific service and its dependencies with host volumes
bash -c '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
$(WINPTY) bash ./programs/provision.sh cache $(DEVNULL)

dev.up.watchers: | check-memory ## Bring up asset watcher containers
bash -c 'docker-compose -f docker-compose-watchers.yml up -d'

dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running
bash -c 'docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml up -d'
bash -c 'docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d'

dev.up.all: | dev.up dev.up.watchers ## Bring up all services with host volumes, including watchers

Expand Down Expand Up @@ -260,13 +260,13 @@ mongo-shell: ## Run a shell on the mongo container
dev.provision.analytics_pipeline: | check-memory dev.provision.analytics_pipeline.run stop.analytics_pipeline stop ## Provision analyticstack dev environment with all services stopped

dev.provision.analytics_pipeline.run:
DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh
DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh

analytics-pipeline-shell: ## Run a shell on the analytics pipeline container
docker exec -it edx.devstack.analytics_pipeline env TERM=$(TERM) /edx/app/analytics_pipeline/devstack.sh open

dev.up.analytics_pipeline: | check-memory ## Bring up analytics pipeline services
bash -c 'docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml up -d analyticspipeline'
bash -c 'docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d analyticspipeline'

pull.analytics_pipeline: ## Update analytics pipeline docker images
docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml pull
Expand Down
2 changes: 1 addition & 1 deletion Makefile.edx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dev.clone_whitelabel: ## Clone edx-themes repo to the parent directory
./repo.sh whitelabel

dev.up.e2e_wl_tests: | check-memory dev.clone_whitelabel ## Bring up all services with edx-themes repo mounted for whitelabel tests.
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_hostnames.yml up -d
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-themes.yml -f ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_hostnames.yml up -d

dev.provision.whitelabel:
${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_provision_wl.sh
Expand Down
2 changes: 1 addition & 1 deletion destroy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -e
read -p "This will delete all data in your devstack. Would you like to proceed? [y/n] " -r
if [[ $REPLY =~ ^[Yy]$ ]]
then
docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v
docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-analytics-pipeline.yml down -v
fi
2 changes: 2 additions & 0 deletions docker-compose-watchers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions docs/pycharm_integration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ use the following options:

- ``/LOCAL/PATH/TO/devstack/docker-compose.yml`` (e.g.~/edx/devstack/docker-compose.yml)
- ``/LOCAL/PATH/TO/devstack/docker-compose-host.yml``
- ``/LOCAL/PATH/TO/devstack/docker-compose-themes.yml``

- Service: lms (or whatever IDA you wish to test)

Expand Down
8 changes: 4 additions & 4 deletions marketing.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ marketing-shell: ## Run a shell on the marketing site container
docker exec -it edx.devstack.marketing env TERM=$(TERM) bash -c 'cd /edx/app/edx-mktg/edx-mktg; exec /bin/bash -sh'

stop-marketing: ## Stop all services (including the marketing site) with host volumes
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml stop
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml stop

down-marketing: ## Bring down all services (including the marketing site) with host volumes
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml down
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml down

up-marketing: ## Bring up all services (including the marketing site) with host volumes
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up

up-marketing-detached: ## Bring up all services (including the marketing site) with host volumes (in detached mode)
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d

up-marketing-sync: ## Bring up all services (including the marketing site) with docker-sync
docker-sync-stack start -c docker-sync-marketing-site.yml
Expand Down