From 23f62bb6f6eca073a7e34383eca38638287d3807 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 2 May 2021 14:50:51 +0000 Subject: [PATCH] stuff --- Dockerfile.etherpad | 9 +++++++-- Dockerfile_copy.etherpad | 12 ++++++++++++ build_push_etherpad | 4 ++-- services/etherpad/settings.json.docker | 13 +++++++------ 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 Dockerfile_copy.etherpad diff --git a/Dockerfile.etherpad b/Dockerfile.etherpad index 711df69..c4c83c1 100644 --- a/Dockerfile.etherpad +++ b/Dockerfile.etherpad @@ -1,3 +1,8 @@ from etherpad/etherpad -run npm install ep_headerauth ep_fileupload && npm install ep_headings2 ep_markdown ep_font_color ep_set_title_on_pad ep_image_upload ep_embedded_hyperlinks2 ep_fileupload ep_linkify -copy services/etherpad/settings.json.docker ./settings.json \ No newline at end of file +run npm install npm uninstall node-pre-gyp --save && \ + npm install @mapbox/node-pre-gyp --save +run npm install sqlite3@4 +run npm install ep_headerauth@1.1.7 +run npm install ep_image_upload@1.0.32 +run npm install ep_headings2 ep_align ep_font_color ep_embedded_hyperlinks2 +copy services/etherpad/settings.json.docker ./settings.json diff --git a/Dockerfile_copy.etherpad b/Dockerfile_copy.etherpad new file mode 100644 index 0000000..38c1a4f --- /dev/null +++ b/Dockerfile_copy.etherpad @@ -0,0 +1,12 @@ +from etherpad/etherpad +run npm install --unsafe-perm sqlite3@4.2.0 +run npm install ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2 +run npm install ep_headerauth +copy services/etherpad/settings.json.docker ./settings.json + +user root +run apt-get update && apt-get install -y sqlite3 python3 build-essential +run npm update node +run npm i -g npm-upgrade && npm install sqlite3 + +run npm install ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2 diff --git a/build_push_etherpad b/build_push_etherpad index 6f13833..9a8e2d0 100755 --- a/build_push_etherpad +++ b/build_push_etherpad @@ -2,5 +2,5 @@ export REGISTRY="docker.triton2.fet.at" # Build a development Image with Theia and all content -docker build -f Dockerfile.etherpad -t $REGISTRY/etherpad:latest . -docker push $REGISTRY/etherpad \ No newline at end of file +docker build --no-cache -f Dockerfile.etherpad -t $REGISTRY/etherpad:latest . +docker push $REGISTRY/etherpad:latest \ No newline at end of file diff --git a/services/etherpad/settings.json.docker b/services/etherpad/settings.json.docker index 761304e..2cae30e 100644 --- a/services/etherpad/settings.json.docker +++ b/services/etherpad/settings.json.docker @@ -424,12 +424,13 @@ * If you want to mitigate this, please install ep_hash_auth and * follow the section "secure your installation" in README.md */ - "headerauth": { - // Defaults to "x-authenticated-user" - "username_header": "x-authenticated-user", - // Defaults to "x-authenticated-name" - "displayname_header": "x-authenticated-user" - }, + /* + * "headerauth": { + * // Defaults to "x-authenticated-user" + * "username_header": "x-authenticated-user", + * // Defaults to "x-authenticated-name" + * "displayname_header": "x-authenticated-user" + },*/ "ep_image_upload": { "fileTypes": ["jpeg", "jpg", "bmp", "gif", "png"], "maxFileSize": 12000000