pulls out ETHERPAD_DATA_DIR
This commit is contained in:
+1
-1
@@ -39,7 +39,7 @@ services:
|
||||
ALPINE_VERSION: ${ALPINE_VERSION}
|
||||
ETHERPAD_VERSION: ${ETHERPAD_VERSION}
|
||||
volumes:
|
||||
- ./etherpad/var:/var/app/var
|
||||
- ${ETHERPAD_DATA_DIR}:/var/app/var
|
||||
environment:
|
||||
NODE_ENV: ${ETHERPAD_NODE_ENV}
|
||||
ADMIN_PASSWORD: ${ETHERPAD_ADMIN_PASSWORD}
|
||||
|
||||
@@ -4,6 +4,7 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\
|
||||
IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
|
||||
COMPOSE_CMD := \
|
||||
IMAGE_PREFIX="$(IMAGE_PREFIX)" \
|
||||
ETHERPAD_DATA_DIR="$(ETHERPAD_DATA_DIR)" \
|
||||
VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \
|
||||
LOCAL_SMTP_PORT=$(PORT_smtp) \
|
||||
$(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \
|
||||
|
||||
@@ -29,6 +29,7 @@ PORT_vaultwarden := 9000
|
||||
|
||||
PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public
|
||||
|
||||
export ETHERPAD_DATA_DIR := /var/etherpad/var
|
||||
export VAULTWARDEN_DATA_DIR := /var/vaultwarden
|
||||
|
||||
$(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \
|
||||
|
||||
Reference in New Issue
Block a user