Skip to content
Open
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
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ dev.restore:
docker compose exec -T mysql80 mysql < .dev/enterprise_access_all.sql

app-shell: # Run the app shell as root
docker exec -u 0 -it enterprise_access.app bash
docker exec -u 0 -it enterprise-access.app bash

db-shell-57: # Run the mysql 5.7 shell as root, enter the app's database
docker exec -u 0 -it enterprise_access.db mysql -u root enterprise_access
Expand All @@ -242,8 +242,11 @@ dev.dbcopy8: ## Copy data from old mysql 5.7 container into a new 8 db
app-restart-devserver: # restart just the app Django dev server
docker-compose exec app bash -c 'kill $$(ps aux | egrep "manage.py ?\w* runserver" | egrep -v "while|grep" | awk "{print \$$2}")'

%-attach:
docker attach enterprise_access.$*
app-attach:
docker attach enterprise-access.app

worker-attach:
docker attach enterprise_access.worker

%-shell: # Run a shell, as root, on the specified service container
docker exec -u 0 -it enterprise_access.$* bash
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:

app:
image: edxops/enterprise-access-dev
container_name: enterprise_access.app
container_name: enterprise-access.app
volumes:
- .:/edx/app/enterprise-access/
- ../src:/edx/src
Expand Down
2 changes: 2 additions & 0 deletions enterprise_access/settings/devstack.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from enterprise_access.settings.local import *

ALLOWED_HOSTS = ['*']

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
Expand Down