Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor project tree to handle multiple OpenEdx releases #112

Merged
merged 14 commits into from
Sep 9, 2019
Merged

Refactor project tree to handle multiple OpenEdx releases #112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c8d8e4a
🚚(project) add support for multiple releases
jmaupetit Aug 28, 2019
0791e44
✨(project) make project tasks release-aware
jmaupetit Aug 28, 2019
5e9ea2a
🚚(project) add hawthorn/1/bare release
jmaupetit Aug 30, 2019
6cd8e00
✨(project) add environment management tools
jmaupetit Aug 30, 2019
95e7f4f
👷(project) add support for multiple releases
jmaupetit Aug 30, 2019
d86daa9
🚚(project) add hawthorn/1/oee release
jmaupetit Sep 3, 2019
33c6d54
🐛(hawthorn/1/bare) add lynx missing dependency
jmaupetit Sep 3, 2019
23a6f9d
📝(README) add multi-release usage
jmaupetit Sep 3, 2019
a47a05e
✨(project) add bin/compose shortcut
jmaupetit Sep 4, 2019
d647ffd
👷(project) add quality jobs
jmaupetit Sep 5, 2019
799a826
⚡️(project) integrate dockerize to ensure services availability
jmaupetit Sep 5, 2019
f4847d5
🐛(config) fix sentry logger in development
jmaupetit Sep 5, 2019
93c50a8
⚡️(project) move make rules to an exec logic
jmaupetit Sep 5, 2019
5c1fba0
👷(project) test production builds
jmaupetit Sep 5, 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
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ dev: \
dev: ## start the cms and lms services (development image and servers)
# starts lms-dev as well via docker-compose dependency
$(COMPOSE) up -d cms-dev
@echo "Wait for services to be up..."
$(COMPOSE_RUN) dockerize -wait tcp://mysql:3306 -timeout 60s
$(COMPOSE_RUN) dockerize -wait tcp://cms-dev:8000 -timeout 60s
$(COMPOSE_RUN) dockerize -wait tcp://lms-dev:8000 -timeout 60s
.PHONY: dev

# In development, we work with local directories (on our host machine) for
Expand Down Expand Up @@ -192,6 +196,10 @@ migrate: ## perform database migrations

run: tree ## start the cms and lms services (nginx + production image)
$(COMPOSE) up -d nginx
@echo "Wait for services to be up..."
$(COMPOSE_RUN) dockerize -wait tcp://mysql:3306 -timeout 60s
$(COMPOSE_RUN) dockerize -wait tcp://nginx:8071 -timeout 60s
$(COMPOSE_RUN) dockerize -wait tcp://nginx:8081 -timeout 60s
.PHONY: run

stop: ## stop the development servers
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,6 @@ services:
depends_on:
- lms
- cms

dockerize:
image: jwilder/dockerize
jmaupetit marked this conversation as resolved.
Show resolved Hide resolved