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
2 changes: 1 addition & 1 deletion .github/docker-compose-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:

app:
image: edxops/enterprise-catalog-dev
container_name: enterprise.catalog.app
container_name: edx.devstack.enterprise-catalog
volumes:
- ..:/edx/app/enterprise_catalog/enterprise_catalog
# Use the Django devserver, so that we can hot-reload code changes
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
docker compose -f .github/docker-compose-github.yml up -d
- name: Install test dependencies and run validation
run: |
docker exec -e TOXENV=py312-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh
docker exec -e TOXENV=py312-${{ matrix.django-version }} -u root edx.devstack.enterprise-catalog /edx/app/enterprise_catalog/enterprise_catalog/validate.sh
- name: Code Coverage
if: matrix.python-version == '3.12' && matrix.django-version=='django52'
uses: codecov/codecov-action@v5
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ dev.provision:
dev.init: dev.up dev.migrate # start the docker container and run migrations

dev.makemigrations:
docker exec -it enterprise.catalog.app bash -c 'cd /edx/app/enterprise-catalog && python3 manage.py makemigrations'
docker exec -it edx.devstack.enterprise-catalog bash -c 'cd /edx/app/enterprise-catalog && python3 manage.py makemigrations'

dev.migrate: # Migrates databases. Application and DB server must be up for this to work.
docker exec -it enterprise.catalog.app bash -c 'cd /edx/app/enterprise-catalog && make migrate'
docker exec -it edx.devstack.enterprise-catalog bash -c 'cd /edx/app/enterprise-catalog && make migrate'

dev.up: dev.up.redis # Starts all containers
docker-compose up -d
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-catalog-dev
container_name: enterprise.catalog.app
container_name: edx.devstack.enterprise-catalog
hostname: app.catalog.enterprise
working_dir: /edx/app/enterprise-catalog
volumes:
Expand Down
4 changes: 2 additions & 2 deletions provision-catalog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ sleep 5

# Run migrations
echo -e "${GREEN}Running migrations for ${name}...${NC}"
docker exec -t enterprise.catalog.app bash -c "cd /edx/app/${directory}/ && make migrate"
docker exec -t edx.devstack.enterprise-catalog bash -c "cd /edx/app/${directory}/ && make migrate"

# Create superuser
echo -e "${GREEN}Creating super-user for ${name}...${NC}"
docker exec -t enterprise.catalog.app bash -c "echo 'from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"edx@example.com\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None' | python /edx/app/${directory}/manage.py shell"
docker exec -t edx.devstack.enterprise-catalog bash -c "echo 'from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"edx@example.com\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None' | python /edx/app/${directory}/manage.py shell"

# Provision IDA User in LMS
echo -e "${GREEN}Provisioning ${name}_worker in LMS...${NC}"
Expand Down