From 3d532ad3d5ef510d90c9ab8645555071e330714b Mon Sep 17 00:00:00 2001 From: liufffan Date: Thu, 24 Sep 2015 20:04:44 +0800 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0d8d1a5..64c8c3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,6 @@ RUN ./hackpad/bin/build.sh ADD start.sh start.sh RUN chmod +x start.sh -EXPOSE 9000 +EXPOSE 5000 CMD '/home/hackpad/start.sh' From 5a292767a7de444a8377a641032ddfbc445df2cf Mon Sep 17 00:00:00 2001 From: liufffan Date: Mon, 28 Sep 2015 13:25:53 +0800 Subject: [PATCH 2/3] Update start.sh --- start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start.sh b/start.sh index 7d4f7d8..6e0685a 100644 --- a/start.sh +++ b/start.sh @@ -5,11 +5,11 @@ set -e cd "$( dirname "${BASH_SOURCE[0]}" )" ADMIN_EMAILS=${ADMIN_EMAILS:-admin@example.com} -DB_HOST=${DB_HOST:-mysql} +DB_HOST=${DB_HOST:-127.0.0.1} DB_PORT=${DB_PORT:-3306} DB_NAME=${DB_NAME:-hackpad} -DB_USERNAME=${DB_USERNAME:-hackpad} -DB_PASSWORD=${DB_PASSWORD:-password} +DB_USERNAME=${DB_USERNAME:-admin} +DB_PASSWORD=${DB_PASSWORD:-85cd284d} TOP_DOMAINS=${TOP_DOMAINS:-localhost,localbox.info} cp hackpad/etherpad/etc/etherpad.local.properties.tmpl hackpad/etherpad/etc/etherpad.local.properties From 4052a573d9244f728164fdad27339648cbbb25a1 Mon Sep 17 00:00:00 2001 From: liufffan Date: Mon, 28 Sep 2015 13:49:23 +0800 Subject: [PATCH 3/3] Update start.sh --- start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/start.sh b/start.sh index 6e0685a..a1467c6 100644 --- a/start.sh +++ b/start.sh @@ -22,6 +22,7 @@ sed -i.bak s/__dbc_dbuser__/$DB_USERNAME/g hackpad/etherpad/etc/etherpad.local.p sed -i.bak s/__dbc_dbpass__/$DB_PASSWORD/g hackpad/etherpad/etc/etherpad.local.properties sed -i.bak "s/^\(topdomains = \).*$/\1$TOP_DOMAINS/g" hackpad/etherpad/etc/etherpad.local.properties sed -i.bak "s/^\(devMode = \).*$/\1 true/g" hackpad/etherpad/etc/etherpad.local.properties +sed -i.bak "s/^\(listen = \).*$/\1 5000/g" hackpad/etherpad/etc/etherpad.local.properties sed -i.bak "s/^\(etherpad\.isProduction = \).*$/\1false/g" hackpad/etherpad/etc/etherpad.local.properties sed -i.bak "s/^\(logDir = \).*$/\1.\/data\/logs/g" hackpad/etherpad/etc/etherpad.local.properties echo 'verbose = true' >> hackpad/etherpad/etc/etherpad.local.properties