diff --git a/DOCKER.md b/DOCKER.md index e5c942f..34cde16 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -20,6 +20,10 @@ Getting it running docker run -d -p 9000:9000 -v /path/to/this/repo:/etc/hackpad/src hackpad + It'll build hackpad and run schema migrations and such. If you want to see what's going on, do: + + docker logs -f [container name] + 4. Fix networking (one time only). If you're on OS X or Windows, you'll need to set up some port forwarding to have Hackpad work properly. Linux folk can skip this. 1. Open VirtualBox diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index 26c563e..6d0ece6 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -23,12 +23,12 @@ if [ "$1" = 'hackpad' ]; then echo "-->Editing configuration files" - sed 's:^export SCALA_HOME=".*$:export SCALA_HOME="/usr/share/java":' -i '' bin/exports.sh - sed 's:^export SCALA_LIBRARY_JAR=".*$:export SCALA_LIBRARY_JAR="$SCALA_HOME/scala-library.jar":' -i '' bin/exports.sh - sed 's:^export JAVA_HOME=".*$:export JAVA_HOME="/usr/share/java":' -i '' bin/exports.sh + sed 's:^export SCALA_HOME=".*$:export SCALA_HOME="/usr/share/java":' -i'' bin/exports.sh + sed 's:^export SCALA_LIBRARY_JAR=".*$:export SCALA_LIBRARY_JAR="$SCALA_HOME/scala-library.jar":' -i'' bin/exports.sh + sed 's:^export JAVA_HOME=".*$:export JAVA_HOME="/usr/share/java":' -i'' bin/exports.sh cp etherpad/etc/etherpad.localdev-default.properties etherpad/etc/etherpad.local.properties - sed 's:__email_addresses_with_admin_access__:admin@localhost.info:' -i '' etherpad/etc/etherpad.local.properties + sed 's:__email_addresses_with_admin_access__:admin@localhost.info:' -i'' etherpad/etc/etherpad.local.properties echo "-->Running build"