Skip to content

Commit 43154ed

Browse files
authored
Merge pull request #697 from openedx/aed/fix-app-name
build: make app name valid http address
2 parents 08e9526 + 0716a0c commit 43154ed

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ dev.restore:
223223
docker compose exec -T mysql80 mysql < .dev/enterprise_access_all.sql
224224

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

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

249-
%-attach:
250-
docker attach enterprise_access.$*
249+
app-attach:
250+
docker attach enterprise-access.app
251+
252+
worker-attach:
253+
docker attach enterprise_access.worker
251254

252255
%-shell: # Run a shell, as root, on the specified service container
253256
docker exec -u 0 -it enterprise_access.$* bash

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323

2424
app:
2525
image: edxops/enterprise-access-dev
26-
container_name: enterprise_access.app
26+
container_name: enterprise-access.app
2727
volumes:
2828
- .:/edx/app/enterprise-access/
2929
- ../src:/edx/src

enterprise_access/settings/devstack.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from enterprise_access.settings.local import *
22

3+
ALLOWED_HOSTS = ['*']
4+
35
DATABASES = {
46
'default': {
57
'ENGINE': 'django.db.backends.mysql',

0 commit comments

Comments
 (0)