From 3726f318b2e6b84d398712456b1f9760f16ab856 Mon Sep 17 00:00:00 2001
From: Juho Hautala <juho.hautala@helsinki.fi>
Date: Tue, 2 Jun 2015 14:30:08 +0300
Subject: [PATCH 1/4] env vars for docker

---
 .env | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..12374f8
--- /dev/null
+++ b/.env
@@ -0,0 +1,4 @@
+# omniauth
+GITHUB_KEY=1345ea9847ae829f1c55
+GITHUB_SECRET=cad4971312c0fecfdc7a2e408816a48b99477ebb
+

From d280860780f721a9eccc57f6c20d9426836472de Mon Sep 17 00:00:00 2001
From: Juho Hautala <juho.hautala@helsinki.fi>
Date: Tue, 2 Jun 2015 14:30:21 +0300
Subject: [PATCH 2/4] initial Dockerfile

---
 Dockerfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Dockerfile

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
+

From f8ebb38cbbba33bf6a73f082c431d8a4170c4d85 Mon Sep 17 00:00:00 2001
From: Juho Hautala <juho.hautala@helsinki.fi>
Date: Tue, 2 Jun 2015 14:30:53 +0300
Subject: [PATCH 3/4] initial docker compose file

---
 docker-compose.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docker-compose.yml

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
+

From 0632431a5fb496938606e2586974299321160495 Mon Sep 17 00:00:00 2001
From: Juho Hautala <juho.hautala@helsinki.fi>
Date: Tue, 2 Jun 2015 22:22:54 +0300
Subject: [PATCH 4/4] don't track .env file

---
 .env       | 4 ----
 .gitignore | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 12374f8..0000000
--- a/.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# omniauth
-GITHUB_KEY=1345ea9847ae829f1c55
-GITHUB_SECRET=cad4971312c0fecfdc7a2e408816a48b99477ebb
-
diff --git a/.gitignore b/.gitignore
index 029e155..7f144df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 !/log/.keep
 /tmp
 
+.env
 .envrc
 *.swp