diff --git a/Dockerfile b/Dockerfile
index d0062ab3..77983a17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ COPY config/site.docker.yml /app/config/site.yml
 RUN RAILS_ENV=production bundle exec rake assets:precompile
 
 COPY docker-entrypoint.sh /
-ENTRYPOINT ["./docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
 EXPOSE 3000
 
diff --git a/script/docker-environment b/script/docker-environment
index cfdb447c..8df83c1b 100755
--- a/script/docker-environment
+++ b/script/docker-environment
@@ -2,6 +2,9 @@
 
 set -e
 
+# Find our app dir
+appdir=$(cd $(dirname "$0")/.. && pwd)
+
 # Check if we've been told to run the command in Docker Composer.
 cmd="$@"; [ "$#" -eq 0 ] && cmd=bash
 export VOLUME="$appdir:/app"