Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ export
# for existing scripts and workflows.
include compatibility.mk

# Include local, git-ignored Makefile with additional targets.
-include local.mk # Prefix with hyphen to tolerate absence of file.


########################################################################################
# Targets for managing the Devstack repo itself.
########################################################################################
Expand Down Expand Up @@ -570,3 +566,6 @@ build-courses: ## Build course and provision cms, and ecommerce with it.

migrate-repo-git-to-edx: ## Migrate enterprise repository clones from openedx to edx GitHub org.
./migrate-repo-git-to-edx.sh

# Include local, git-ignored Makefile with additional targets.
-include local.mk # Prefix with hyphen to tolerate absence of file.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ services:

license-manager-worker:
image: edxops/license-manager-dev:latest
command: bash -c 'cd /edx/app/license_manager/license_manager && celery -A license_manager worker -Q license_manager.default -l DEBUG'
command: bash -c 'cd /edx/app/license_manager && celery -A license_manager worker -Q license_manager.default -l DEBUG'
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.license-manager-worker"
hostname: license-manager-worker.devstack.edx
depends_on:
Expand Down
Loading