Merge pull request #9 from pierreozoux/master

Adds configuration for etherpad port
tvelocity · May 24, 2015 · 0acff94 · 0acff94
2 parents 772f477 + 7e3df52
commit 0acff94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/etherpad-lite/README.md b/etherpad-lite/README.md
@@ -44,6 +44,7 @@ already exist. You can now access Etherpad Lite from http://localhost:9001/
 This image supports the following environment variables:
 
 * `ETHERPAD_TITLE`: Title of the Etherpad Lite instance. Defaults to "Etherpad".
+* `ETHERPAD_PORT`: Port of the Etherpad Lite instance. Defaults to 9001.
 * `ETHERPAD_SESSION_KEY`: Session key for the Etherpad Lite configuraition. You
 can set this in case of migrating from another installation. A value is
 automatically generated by default.

diff --git a/etherpad-lite/entrypoint.sh b/etherpad-lite/entrypoint.sh
@@ -26,6 +26,7 @@ if [ -z "$ETHERPAD_DB_PASSWORD" ]; then
 fi
 
 : ${ETHERPAD_TITLE:=Etherpad}
+: ${ETHERPAD_PORT:=9001}
 : ${ETHERPAD_SESSION_KEY:=$(
 		node -p "require('crypto').randomBytes(32).toString('hex')")}
 
@@ -48,7 +49,7 @@ if [ ! -f settings.json ]; then
 	{
 	  "title": "${ETHERPAD_TITLE}",
 	  "ip": "0.0.0.0",
-	  "port" : 9001,
+	  "port" :${ETHERPAD_PORT},
 	  "sessionKey" : "${ETHERPAD_SESSION_KEY}",
 	  "dbType" : "mysql",
 	  "dbSettings" : {