christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-11-05 04:48:00 +00:00
Code Issues Releases Activity

Rename up & daemon make commands

Browse Source 
The new commands are "run" and "daemonize". Older commands are
preserved, although they are undocumented.
This commit is contained in:
Régis Behmo 2018-09-15 12:20:35 +02:00
parent adf994fa35
commit e1d73660d2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
# Changelog # Changelog
- 2018-09-15 [Improvement] Rename "up" and "daemon" commands to "run" and "daemonize"
- 2018-09-15 [Feature] Activate course search and discovery - 2018-09-15 [Feature] Activate course search and discovery
- 2018-09-15 [Bugfix] Deduplicate console logs from lms/cms - 2018-09-15 [Bugfix] Deduplicate console logs from lms/cms
- 2018-09-05 [Improvement] Use a single email address for all inbound email - 2018-09-05 [Improvement] Use a single email address for all inbound email

10
Makefile
View File

@ -1,4 +1,4 @@
.PHONY: all android configure build update migrate assets up daemon .PHONY: all android configure build update migrate assets run daemonize
PWD ?= $$(pwd) PWD ?= $$(pwd)
USERID ?= $$(id -u) USERID ?= $$(id -u)
@ -24,7 +24,7 @@ endif
DOCKER_COMPOSE_RUN_LMS = $(DOCKER_COMPOSE_RUN_OPENEDX) -p 8000:8000 lms DOCKER_COMPOSE_RUN_LMS = $(DOCKER_COMPOSE_RUN_OPENEDX) -p 8000:8000 lms
DOCKER_COMPOSE_RUN_CMS = $(DOCKER_COMPOSE_RUN_OPENEDX) -p 8001:8001 cms DOCKER_COMPOSE_RUN_CMS = $(DOCKER_COMPOSE_RUN_OPENEDX) -p 8001:8001 cms
all: configure $(post_configure_targets) update migrate assets daemon all: configure $(post_configure_targets) update migrate assets daemonize
@echo "All set \o/ You can access the LMS at http://localhost and the CMS at http://studio.localhost" @echo "All set \o/ You can access the LMS at http://localhost and the CMS at http://studio.localhost"
##################### Bootstrapping ##################### Bootstrapping
@ -74,12 +74,14 @@ assets:
##################### Running ##################### Running
up: run:
$(DOCKER_COMPOSE) up $(DOCKER_COMPOSE) up
up: run
daemon: daemonize:
$(DOCKER_COMPOSE) up -d && \ $(DOCKER_COMPOSE) up -d && \
echo "Daemon is up and running" echo "Daemon is up and running"
daemon: daemonize
stop: stop:
$(DOCKER_COMPOSE) rm --stop --force $(DOCKER_COMPOSE) rm --stop --force

6
README.md
View File

@ -108,7 +108,7 @@ If migrations are stopped with a `Killed` message, this certainly means the dock
### Running Open edX ### Running Open edX
make up make run
This will launch the various docker containers required for your Open edX platform. The LMS and the Studio will then be reachable at the domain name you specified during the configuration step. You can also access them at [http://localhost](http://localhost) and [http://studio.localhost](http://studio.localhost). This will launch the various docker containers required for your Open edX platform. The LMS and the Studio will then be reachable at the domain name you specified during the configuration step. You can also access them at [http://localhost](http://localhost) and [http://studio.localhost](http://studio.localhost).
@ -130,9 +130,9 @@ On a fresh install, your platform will not have a single course. To import the [
### Daemonizing ### Daemonizing
In production, you will probably want to daemonize the services. Instead of `make up`, run: In production, you will probably want to daemonize the services. Instead of `make run`, run:
make daemon make daemonize
And then, to stop all services: And then, to stop all services: