summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-08-13 19:24:07 +0300
committerLauri Ojansivu <x@xet7.org>2018-08-13 19:24:07 +0300
commitb9929dc68297539a94d21950995e26e06745a263 (patch)
tree52783b89881e5315ae1f9e736b621122966e4ae5 /Dockerfile
parent79e464bf90171e1aabdee8470d0bcc5fd4339d5b (diff)
downloadwekan-b9929dc68297539a94d21950995e26e06745a263.tar.gz
wekan-b9929dc68297539a94d21950995e26e06745a263.tar.bz2
wekan-b9929dc68297539a94d21950995e26e06745a263.zip
- When Content Policy is enabled, allow one URL to have iframe that embeds Wekan
- Add option to turn off Content Policy - Allow always in Wekan markdown <img src="any-image-url-here"> Thanks to xet7 ! Closes #1676
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 39002070..a548adf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,8 @@ ARG MATOMO_ADDRESS
ARG MATOMO_SITE_ID
ARG MATOMO_DO_NOT_TRACK
ARG MATOMO_WITH_USERNAME
+ARG BROWSER_POLICY_ENABLED
+ARG TRUSTED_URL
# Set the environment variables (defaults where required)
# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
@@ -33,7 +35,8 @@ ENV MATOMO_ADDRESS ${MATOMO_ADDRESS:-}
ENV MATOMO_SITE_ID ${MATOMO_SITE_ID:-}
ENV MATOMO_DO_NOT_TRACK ${MATOMO_DO_NOT_TRACK:-false}
ENV MATOMO_WITH_USERNAME ${MATOMO_WITH_USERNAME:-true}
-
+ENV BROWSER_POLICY_ENABLED ${BROWSER_POLICY_ENABLED:-true}
+ENV TRUSTED_URL ${TRUSTED_URL:-}
# Copy the app to the image
COPY ${SRC_PATH} /home/wekan/app