Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add portal-designer to devstack #82

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

huniafatima-arbi
Copy link
Member

No description provided.

@huniafatima-arbi huniafatima-arbi self-assigned this Nov 19, 2024
@huniafatima-arbi huniafatima-arbi marked this pull request as draft November 19, 2024 11:48
@huniafatima-arbi huniafatima-arbi changed the title chore: add docker compose service and shell target chore: add portal-designer to devstack Nov 19, 2024
@huniafatima-arbi huniafatima-arbi marked this pull request as ready for review November 19, 2024 19:24
@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-portal-designer-in-devstack branch from 8c43dbf to 173e049 Compare November 20, 2024 09:23
@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-portal-designer-in-devstack branch from ef7cb74 to ae060a1 Compare February 7, 2025 10:02
@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-portal-designer-in-devstack branch from ae060a1 to 66d544a Compare February 7, 2025 10:07
Copy link
Member

@iamsobanjaved iamsobanjaved left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is missing the change in docker-compose.yml file. Also indicated few other possible changes.

Comment on lines +410 to +412
dev.shell.designer:
docker exec -it edx.devstack.designer env TERM=$(TERM) bash -c '/bin/bash'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed

@@ -31,7 +31,6 @@ services:
- edxapp_tox:/edx/app/edxapp/edx-platform/.tox
- edxapp_uploads:/edx/var/edxapp/uploads
- ${DEVSTACK_WORKSPACE}/src:/edx/src
- ${PWD}/py_configuration_files/cms.py:/edx/app/edxapp/edx-platform/cms/envs/devstack.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

@@ -57,7 +61,6 @@ services:
- edxapp_uploads:/edx/var/edxapp/uploads
- ${DEVSTACK_WORKSPACE}/src:/edx/src
- ${PWD}/py_configuration_files/cms.py:/edx/app/edxapp/edx-platform/cms/envs/devstack.py
- ${PWD}/py_configuration_files/lms.py:/edx/app/edxapp/edx-platform/lms/envs/devstack.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar, why is this being removed?


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use docker compose exec with ${name} for a similar command pattern. Also in next commands as well.

Comment on lines +30 to +36
# Provision IDA User in LMS
echo -e "${GREEN}Provisioning ${name}_worker in LMS...${NC}"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user ${name}_worker ${name}[email protected] --staff --superuser"

# Create the DOT applications - one for single sign-on and one for backend service IDA-to-IDA authentication.
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type authorization-code --skip-authorization --redirect-uris 'http://localhost:${port}/complete/edx-oauth2/' --client-id '${name}-sso-key' --client-secret '${name}-sso-secret' --scopes 'user_id' ${name}-sso ${name}_worker"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type client-credentials --client-id '${name}-backend-service-key' --client-secret '${name}-backend-service-secret' ${name}-backend-service ${name}_worker"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can call provison-ida-user.sh script here.

Example

docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type client-credentials --client-id '${name}-backend-service-key' --client-secret '${name}-backend-service-secret' ${name}-backend-service ${name}_worker"

# Restart designer app
docker compose stop designer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we restart instead of stopping, as indicated by comment.

@@ -67,6 +67,8 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
+------------------------------------+-------------------------------------+----------------+--------------+
| `frontend-app-ora-grading`_ | http://localhost:1993 | MFE (React.js) | Extra |
+------------------------------------+-------------------------------------+----------------+--------------+
| `designer`_ | http://localhost:3307 | Python/Django | Extra |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong port mentioned here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants