diff --git a/Dockerfile b/Dockerfile
index 1a204173..3fcc2bb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,6 @@ COPY Gemfile Gemfile.lock ./
 
 RUN bundle install --without production
 
-COPY . .
+COPY . ./
 
-EXPOSE 3000
-CMD ["rails", "server", "-b", "0.0.0.0"]
+ENTRYPOINT ["./docker-entrypoint.sh"]
diff --git a/Gemfile.lock b/Gemfile.lock
index f9e67838..ceabc953 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -469,6 +469,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 00000000..51863829
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ -f tmp/pids/server.pid ]; then
+  rm tmp/pids/server.pid
+fi
+
+bundle exec rails s -b 0.0.0.0