christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-13 06:37:46 +00:00
Code Issues Releases Activity

Collect assets with user-specified settings

Browse Source 
This allows the user to easily collect assets in development
This commit is contained in:
Régis Behmo 2018-04-21 12:41:34 +02:00
parent dede31d1d3
commit 93a8fa0cba
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,9 +1,8 @@
.PHONY: all configure build migrate assets up daemon .PHONY: all configure build migrate assets up daemon
DOCKER_COMPOSE_RUN = docker-compose run --rm -e USERID="$$(id -u)" DOCKER_COMPOSE_RUN = docker-compose run --rm -e USERID="$$(id -u)"
ifneq ($(EDX_PLATFORM_SETTINGS),) EDX_PLATFORM_SETTINGS = production
DOCKER_COMPOSE_RUN += -e SETTINGS=$(EDX_PLATFORM_SETTINGS) DOCKER_COMPOSE_RUN += -e SETTINGS=$(EDX_PLATFORM_SETTINGS)
endif
ifneq ($(EDX_PLATFORM_PATH),) ifneq ($(EDX_PLATFORM_PATH),)
DOCKER_COMPOSE_RUN += --volume="$(EDX_PLATFORM_PATH):/openedx/edx-platform" DOCKER_COMPOSE_RUN += --volume="$(EDX_PLATFORM_PATH):/openedx/edx-platform"
endif endif
@ -26,8 +25,8 @@ migrate:
$(DOCKER_COMPOSE_RUN_CMS) bash -c "wait-for-greenlight.sh && ./manage.py cms migrate" $(DOCKER_COMPOSE_RUN_CMS) bash -c "wait-for-greenlight.sh && ./manage.py cms migrate"
assets: assets:
$(DOCKER_COMPOSE_RUN_LMS) paver update_assets lms --settings=production $(DOCKER_COMPOSE_RUN_LMS) paver update_assets lms --settings=$(EDX_PLATFORM_SETTINGS)
$(DOCKER_COMPOSE_RUN_CMS) paver update_assets cms --settings=production $(DOCKER_COMPOSE_RUN_CMS) paver update_assets cms --settings=$(EDX_PLATFORM_SETTINGS)
##################### Running ##################### Running