diff --git a/.github/workflows/provisioning-tests.yml b/.github/workflows/provisioning-tests.yml index 5af1594975..b3538b5b6c 100644 --- a/.github/workflows/provisioning-tests.yml +++ b/.github/workflows/provisioning-tests.yml @@ -30,7 +30,7 @@ jobs: os: - ubuntu-20.04 # Ubuntu 20.04 "Focal Fossa" python-version: [ '3.11' ] - services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms] + services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms, designer+lms] fail-fast: false # some services can be flaky; let others run to completion even if one fails steps: diff --git a/docker-compose-host.yml b/docker-compose-host.yml index 0035e3eb00..21f0b14496 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -44,10 +44,11 @@ services: registrar: volumes: - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar + - ${PWD}/py_configuration_files/registrar.py:/edx/app/registrar/registrar/registrar/settings/devstack.py designer: volumes: - ${DEVSTACK_WORKSPACE}/portal-designer:/edx/app/designer - - ${PWD}/py_configuration_files/registrar.py:/edx/app/registrar/registrar/registrar/settings/devstack.py + - ${PWD}/py_configuration_files/portal_designer.py:/edx/app/designer/designer/settings/devstack.py registrar-worker: volumes: - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar diff --git a/docker-compose.yml b/docker-compose.yml index 0fcf1856da..372106102d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -694,7 +694,7 @@ services: - edx.devstack.xqueue_consumer designer: - image: portal-designer-designer + image: edxops/designer-dev:latest # this image doesn't exist on dockerhub yet container_name: edx.devstack.designer volumes: - .:/edx/app/designer diff --git a/provision-designer.sh b/provision-designer.sh index edc84bf33f..156c6aafad 100755 --- a/provision-designer.sh +++ b/provision-designer.sh @@ -1,7 +1,8 @@ name="designer" port="18808" -docker-compose up -d --build +docker-compose up -d $name --build +docker-compose up -d lms # Install requirements # Can be skipped right now because we're using the --build flag on docker-compose. This will need to be changed once we move to devstack. @@ -15,13 +16,16 @@ do done sleep 5 +echo -e "${GREEN}Installing requirements for ${name}...${NC}" +docker compose exec -T ${name} bash -e -c 'cd /edx/app/designer/ && make requirements' -- f"$name" + # Run migrations echo -e "${GREEN}Running migrations for ${name}...${NC}" -docker exec -t designer.app bash -c "cd /edx/app/${name}/ && make migrate" +docker exec -t edx.devstack.designer bash -c "cd /edx/app/${name}/ && make migrate" # Create superuser echo -e "${GREEN}Creating super-user for ${name}...${NC}" -docker exec -t designer.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/${name}/manage.py shell" +docker exec -t edx.devstack.designer 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/${name}/manage.py shell" # Provision IDA User in LMS echo -e "${GREEN}Provisioning ${name}_worker in LMS...${NC}"