Skip to content

Commit

Permalink
fix docker frontend: parameterize ckeditor build dir, use working def…
Browse files Browse the repository at this point in the history
…ault
  • Loading branch information
machisuji committed Aug 31, 2021
1 parent 89dfac5 commit 9f9ca73
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
# This is used to prevent people from using the new docker-compose file for automated installs
LOCAL_DEV_CHECK=1

# Set this to your ckeditor build output directory (which includes ckeditor.js) if you
# want to develop ckeditor locally.
CKEDITOR_BUILD_DIR=frontend/src/vendor/ckeditor/

# This is the host from which you will be accessing the development servers locally
PUBLIC_HOST=localhost

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
command: "npm run serve"
volumes:
- ".:/home/dev/openproject"
- "../commonmark-ckeditor-augmented-textarea-build/build/:/home/dev/openproject/frontend/src/vendor/ckeditor-augmented-textarea/"
- "${CKEDITOR_BUILD_DIR:-./frontend/src/vendor/ckeditor/}:/home/dev/openproject/frontend/src/vendor/ckeditor/"
ports:
- "4200:4200"
- "9999:9999"
Expand Down

0 comments on commit 9f9ca73

Please sign in to comment.