From 9f9ca73a7cdce1f91fe1f3704e78a0e8cb4ad563 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Tue, 31 Aug 2021 11:37:43 +0100 Subject: [PATCH] fix docker frontend: parameterize ckeditor build dir, use working default --- .env.example | 4 ++++ docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 8550cb9623b..80bb2a61091 100644 --- a/.env.example +++ b/.env.example @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 030a771abb5..94ddac6c903 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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"