Skip to content
Merged
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: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ meant to be user-facing, the "homepage" may be the API root.
+---------------------+-------------------------------------+
| Service | URL |
+=====================+=====================================+
| Panel Frontend | http://localhost:3030/ |
+---------------------+-------------------------------------+
| Credentials | http://localhost:18150/api/v2/ |
+---------------------+-------------------------------------+
| Catalog/Discovery | http://localhost:18381/api-docs/ |
Expand Down
6 changes: 5 additions & 1 deletion docker-compose-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@ services:
volumes:
- ${DEVSTACK_WORKSPACE}/edly-wp-plugin:/var/www/html/wp-content/plugins/edly-wp-plugin:cached
- ${DEVSTACK_WORKSPACE}/edly-wp-theme:/var/www/html/wp-content/themes/edly-wp-theme:cached
panel_frontend:
volumes:
- ${DEVSTACK_WORKSPACE}/edly-panel-frontend:/var/www/html/edly-panel-frontend:cached
- panel_node_modules:/var/www/html/edly-panel-frontend/node_modules


volumes:
credentials_node_modules:
discovery_node_modules:
ecommerce_node_modules:
edxapp_node_modules:
gradebook_node_modules:
panel_node_modules:
5 changes: 5 additions & 0 deletions docker-compose-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ services:
volumes:
- wordpress-sync:/var/www/html/wp-content/plugins/edly-wp-plugin:nocopy
- wordpress-sync:/var/www/html/wp-content/themes/edly-wp-theme:nocopy
panel_frontend:
volumes:
- panel_frontend-sync:/var/www/html/edly-panel-frontend:cached

volumes:
credentials-sync:
Expand All @@ -37,3 +40,5 @@ volumes:
external: true
wordpress-sync:
external: true
panel_frontend-sync:
external: true
10 changes: 9 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,15 @@ services:
- mysql
ports:
- "8888:80"


panel_frontend:
command: bash -c 'npm install && npm run start'
container_name: edx.devstack.panel_frontend
working_dir: '/var/www/html/edly-panel-frontend'
image: node:10
ports:
- "3030:3030"

volumes:
discovery_assets:
edxapp_lms_assets:
Expand Down
7 changes: 6 additions & 1 deletion docker-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,9 @@ syncs:
host_disk_mount_mode: 'cached'
src: '../edly-wp-plugin/'
src: '../edly-wp-theme/'
sync_excludes: [ '.git', '.idea', '.sass-cache', 'vendor']
sync_excludes: [ '.git', '.idea', '.sass-cache', 'vendor']

panel_frontend-sync:
host_disk_mount_mode: 'cached'
src: '../edly-panel-frontend/'
sync_excludes: ['.idea']
3 changes: 2 additions & 1 deletion repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ edly_repos=(
"https://github.com/edly-io/edly-wp-plugin.git"
"https://github.com/edly-io/edly-wp-theme.git"
"https://github.com/edly-io/edly-edx-themes.git"
"https://github.com/edly-io/edly-panel-frontend.git"
)


Expand Down Expand Up @@ -111,7 +112,7 @@ _checkout_and_update_branch ()
git fetch origin ${OPENEDX_GIT_BRANCH}:${OPENEDX_GIT_BRANCH}
git checkout ${OPENEDX_GIT_BRANCH}
fi
find . -name '*.pyc' -not -path './.git/*' -delete
find . -name '*.pyc' -not -path './.git/*' -delete
}

clone ()
Expand Down