From 801d519165ef64bf5424ac395abfc838fa25ba9d Mon Sep 17 00:00:00 2001 From: Pierre Prinetti Date: Thu, 24 Oct 2019 11:09:30 +0200 Subject: [PATCH] docker: Fix the comments about settings.json copy The "conditional copy trick" was removed in #3644, but I failed to update the corresponding comment. --- docker/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 469caa23..43a06e08 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -53,12 +53,7 @@ RUN bin/installDeps.sh && \ # able to split at spaces. RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; done -# Copy the custom configuration file, if present. The configuration file has to -# be manually put inside the same directory containing the Dockerfile (we cannot -# directly point to "../settings.json" for Docker's security restrictions). -# -# For the conditional COPY trick, see: -# https://stackoverflow.com/questions/31528384/conditional-copy-add-in-dockerfile#46801962 +# Copy the configuration file. COPY ./settings.json /opt/etherpad-lite/ # Follow the principle of least privilege: run as unprivileged user.