From 28d9ac9b1fb37400133cad675ab3b822e66a02a8 Mon Sep 17 00:00:00 2001
From: TheAssassin <theassassin@users.noreply.github.com>
Date: Sat, 1 Apr 2017 01:13:39 +0200
Subject: [PATCH] Switch to built in rails server

---
 Dockerfile     | 1 -
 docker/init.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0e7a70aa..dab432ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,6 @@ RUN cd /usr/bin && \
 # explicitly add Gemfile and install dependencies using bundler to make use of
 # Docker's caching
 WORKDIR /osem/
-RUN gem install puma
 COPY Gemfile /osem/
 COPY Gemfile.lock /osem/
 RUN bundle install --without test development
diff --git a/docker/init.sh b/docker/init.sh
index 36601e6c..4d71ec77 100644
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -42,4 +42,4 @@ echo ">>> Precompiling assets..."
 bundle exec rake assets:precompile
 
 echo ">>> Starting application server..."
-exec puma -e production
+exec bundle exec rails server -e production -p 9292