Fix docker issues

This commit is contained in:
yflory 2019-03-29 11:33:49 +01:00
parent a745fa1b71
commit 11236c6445
3 changed files with 11 additions and 7 deletions

View File

@ -7,7 +7,7 @@ ENV STORAGE=\'./storage/file\'
ENV LOG_TO_STDOUT=true
# Persistent storage needs
VOLUME /cryptpad/config
VOLUME /cryptpad/cfg
VOLUME /cryptpad/datastore
VOLUME /cryptpad/customize
VOLUME /cryptpad/blobstage

View File

@ -4,8 +4,12 @@
mkdir -p customize
# Copying default config
mkdir -p config
[ ! -f config/config.js ] && echo "Creating config.js" && cp config/config.example.js config/config.js
mkdir -p cfg
[ ! -f cfg/config.js ] && echo "Creating config.js" && cp config/config.example.js cfg/config.js
# Linking config.js
[ ! -L config/config.js ] && echo "Linking config.js" && ln -s ../cfg/config.js config/config.js
# Thanks to http://stackoverflow.com/a/10467453
sedeasy() {
@ -14,13 +18,13 @@ sedeasy() {
# Configure
[ -n "$USE_SSL" ] && echo "Using secure websockets: $USE_SSL" \
&& sedeasy "useSecureWebsockets: [^,]*," "useSecureWebsockets: ${USE_SSL}," config/config.js
&& sedeasy "useSecureWebsockets: [^,]*," "useSecureWebsockets: ${USE_SSL}," cfg/config.js
[ -n "$STORAGE" ] && echo "Using storage adapter: $STORAGE" \
&& sedeasy "storage: [^,]*," "storage: ${STORAGE}," config/config.js
&& sedeasy "storage: [^,]*," "storage: ${STORAGE}," cfg/config.js
[ -n "$LOG_TO_STDOUT" ] && echo "Logging to stdout: $LOG_TO_STDOUT" \
&& sedeasy "logToStdout: [^,]*," "logToStdout: ${LOG_TO_STDOUT}," config/config.js
&& sedeasy "logToStdout: [^,]*," "logToStdout: ${LOG_TO_STDOUT}," cfg/config.js
export FRESH=1
exec node ./server.js

View File

@ -26,4 +26,4 @@ services:
- ./data/blobstage:/cryptpad/blobstage:rw
- ./data/tasks:/cryptpad/tasks:rw
- ./data/block:/cryptpad/block:rw
- ./data/config:/cryptpad/config:rw
- ./data/config:/cryptpad/cfg:rw