From 216fa63c5430292eaec466f871ac85ff0f187131 Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 19 Dec 2018 15:36:52 +0200 Subject: [PATCH 1/2] Update docs --- README.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index f9ba7db116..0e8ccef0b3 100644 --- a/README.rst +++ b/README.rst @@ -40,14 +40,16 @@ the ``tahoe.mk`` file to see the source code. Currently the commands like like t $ make help | grep tahoe tahoe.chown Fix an annoying docker permission issue in both `edx-platform` and `src` - tahoe.clone-theme Clone the theme with Tahoe versions tahoe.exec.edxapp Execute a command in both LMS and Studio (edxapp containers) tahoe.exec.single Execute a command inside a devstack docker container tahoe.init Make the devstack more Tahoe'ish tahoe.init.provision-script Execute the `provision-tahoe.py` script in both of LMS and Studio tahoe.install-pip.edxapp Install a pip package in both of LMS and Studio - tahoe.reset.light Resets the Tahoe settings including a fresh theme copy and new environment files + tahoe.reset.full Does a full reset for everything known to devstack. Will loose all git and database changes. + tahoe.reset.light Resets the Tahoe settings including a fresh theme copy and new environment files. tahoe.restart Restarts both of LMS and Studio python processes while keeping the same container + tahoe.theme.clone Clone the theme with Tahoe branches + tahoe.theme.compile Compile the static assets of the theme tahoe.up Run the devstack with proper Tahoe settings, use instead of `$ make dev.up` From 15aab1fda182a5cf1a2d2c46a41ee252cc25dcf0 Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Wed, 19 Dec 2018 15:40:58 +0200 Subject: [PATCH 2/2] Fix chown command for MacOSX --- tahoe.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tahoe.mk b/tahoe.mk index 7334420eae..ee82a9e743 100644 --- a/tahoe.mk +++ b/tahoe.mk @@ -14,9 +14,12 @@ tahoe.install-pip.edxapp: ## Install a pip package in both of LMS and Studio make COMMAND='pip install $(PACKAGE)' SERVICE=lms tahoe.exec.single make COMMAND='pip install $(PACKAGE)' SERVICE=studio tahoe.exec.single +tahoe.chown.dir: # Fix permissions for a single directory + find $(DIRECTORY) \! -user $(USER) -print -exec sudo chown -R $(USER) {} \; + tahoe.chown: ## Fix an annoying docker permission issue in both `edx-platform` and `src` - sudo chown -R $(USER):$(USER) $(DEVSTACK_WORKSPACE)/edx-platform/ - sudo chown -R $(USER):$(USER) $(DEVSTACK_WORKSPACE)/src/ + make DIRECTORY='$(DEVSTACK_WORKSPACE)/edx-platform/' tahoe.chown.dir + make DIRECTORY='$(DEVSTACK_WORKSPACE)/src/' tahoe.chown.dir tahoe.theme.compile: ## Compile the static assets of the theme make COMMAND='make requirements' tahoe.exec.edxapp