Fix docker issues

pull/1/head
yflory 6 years ago
parent a745fa1b71
commit 11236c6445

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

@ -4,8 +4,12 @@
mkdir -p customize mkdir -p customize
# Copying default config # Copying default config
mkdir -p config mkdir -p cfg
[ ! -f config/config.js ] && echo "Creating config.js" && cp config/config.example.js config/config.js [ ! -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 # Thanks to http://stackoverflow.com/a/10467453
sedeasy() { sedeasy() {
@ -14,13 +18,13 @@ sedeasy() {
# Configure # Configure
[ -n "$USE_SSL" ] && echo "Using secure websockets: $USE_SSL" \ [ -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" \ [ -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" \ [ -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 export FRESH=1
exec node ./server.js exec node ./server.js

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

Loading…
Cancel
Save