diff --git a/Dockerfile b/Dockerfile
index e247ea8..0eff1d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,9 @@
-FROM rails:onbuild
-MAINTAINER owasp
+FROM ruby:2.3.1
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+RUN mkdir /myapp
+WORKDIR /myapp
+ADD Gemfile /myapp/Gemfile
+ADD Gemfile.lock /myapp/Gemfile.lock
+RUN bundle install
+ADD . /myapp
 
-ADD script/start /start
-
-RUN chmod a+x /start
-
-user root
-
-ENV RAILS_ENV development
-
-CMD /start
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..ce935d9
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '2'
+services:
+  web:
+    build: .
+    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+    volumes:
+      - .:/myapp
+    ports:
+      - "3000:3000"