public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: move docker/settings.json to /settings.json.docker

pull/3636/head
muxator 2019-11-08 23:50:50 +01:00
parent dc15f4a43c
commit 30fd53f1fd
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -34,7 +34,7 @@ RUN bin/installDeps.sh && \
RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; done RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; done
# Copy the configuration file. # Copy the configuration file.
COPY ./docker/settings.json /opt/etherpad-lite/settings.json COPY ./settings.json.docker /opt/etherpad-lite/settings.json
# Follow the principle of least privilege: run as unprivileged user. # Follow the principle of least privilege: run as unprivileged user.
# #

11
doc/docker.md
View File

@ -18,12 +18,7 @@ If you want to use a personalized settings file, **you will have to rebuild your
All of the following instructions are as a member of the `docker` group. All of the following instructions are as a member of the `docker` group.
### Rebuilding with custom settings ### Rebuilding with custom settings
Prepare your custom `settings.json` file: Edit `<BASEDIR>/settings.json.docker` at your will. When rebuilding the image, this file will be copied inside your image and renamed to `setting.json`.
```bash
cd <BASEDIR>/docker
cp ../settings.json.template settings.json
[ further edit your settings.json as needed ]
```
**Each configuration parameter can also be set via an environment variable**, using the syntax `"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to `settings.json.template`. **Each configuration parameter can also be set via an environment variable**, using the syntax `"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to `settings.json.template`.
@ -31,7 +26,7 @@ cp ../settings.json.template settings.json
If you want to install some plugins in your container, it is sufficient to list them in the ETHERPAD_PLUGINS build variable. If you want to install some plugins in your container, it is sufficient to list them in the ETHERPAD_PLUGINS build variable.
The variable value has to be a space separated, double quoted list of plugin names (see examples). The variable value has to be a space separated, double quoted list of plugin names (see examples).
Some plugins will need personalized settings in the `settings.json` file. Just refer to the previous section, and include them in your custom `settings.json`. Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`.
### Examples ### Examples
@ -56,7 +51,7 @@ And point your browser to `http://<YOUR_IP>:<DESIRED_PORT>`
## Options available by default ## Options available by default
The `settings.json` available by default enables some configuration to be set from the environment. The `settings.json.docker` available by default enables some configuration to be set from the environment.
Available options: Available options:

0
docker/settings.json → settings.json.docker
View File