diff --git a/.gitignore b/.gitignore
index 029e155..7f144df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 !/log/.keep
 /tmp
 
+.env
 .envrc
 *.swp
 
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9762a3f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,22 @@
+FROM ruby:2.2.0
+
+RUN apt-get update -qq && apt-get install -y build-essential libreadline-dev
+
+# for postgres
+RUN apt-get install -y libpq-dev
+
+# for nokogiri
+RUN apt-get install -y libxml2-dev libxslt1-dev
+
+# for a JS runtime
+RUN apt-get install -y nodejs
+
+ENV APP_HOME /myapp
+RUN mkdir $APP_HOME
+WORKDIR $APP_HOME
+
+ADD Gemfile* $APP_HOME/
+RUN bundle check && bundle install
+
+ADD . $APP_HOME
+
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0659bcf
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,16 @@
+db:
+  image: postgres:9.4
+  ports:
+    - "5432:5432"
+
+web:
+  build: .
+  command: bin/rails s --port 3000 --binding 0.0.0.0
+  ports:
+    - "3000:3000"
+  links:
+    - db
+  volumes:
+    - .:/myapp
+  env_file: .env
+