From a47bb82be83052e05792aeb59ab6c011512b345d Mon Sep 17 00:00:00 2001
From: tim <tim@ascribe.io>
Date: Tue, 21 Nov 2017 11:41:01 +0100
Subject: [PATCH] Dockerize and upgrade ruby

---
 Dockerfile         | 10 ++++++++
 Gemfile            |  2 +-
 Gemfile.lock       | 63 ----------------------------------------------
 docker-compose.yml | 21 ++++++++++++++++
 4 files changed, 32 insertions(+), 64 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 Gemfile.lock
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..91ca485
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM library/ruby:2.2.8
+
+RUN apt-get update -qq
+RUN apt-get install -y build-essential libpq-dev
+
+RUN mkdir -p /usr/src/app
+COPY . /usr/src/app/
+WORKDIR /usr/src/app
+
+RUN bundle install
diff --git a/Gemfile b/Gemfile
index 1e0df14..a690bdd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.1.0'
+ruby '2.2.8'
 
 gem 'sinatra'
 gem 'sinatra-contrib'
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 81d3216..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,63 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    backports (3.3.5)
-    coderay (1.1.0)
-    dalli (2.6.4)
-    dotenv (0.9.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    kgio (2.8.1)
-    method_source (0.8.2)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    newrelic_rpm (3.6.9.171)
-    octokit (2.5.1)
-      sawyer (~> 0.5.1)
-    pry (0.9.12.3)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.5.1)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    raindrops (0.12.0)
-    sawyer (0.5.1)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.1)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    slop (3.4.6)
-    tilt (1.4.1)
-    unicorn (4.7.0)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dalli
-  dotenv
-  newrelic_rpm
-  octokit
-  pry
-  rack-cache
-  sinatra
-  sinatra-contrib
-  unicorn
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e516919
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '2'
+services:
+  db:
+    image: memcached
+  web:
+    build: .
+    command: bundle exec unicorn -p 3000
+    volumes:
+      - .:/myapp
+    ports:
+      - "3000:3000"
+    depends_on:
+      - db
+    environment:
+      MEMCACHEDCLOUD_SERVERS: db
+      MEMCACHEDCLOUD_USERNAME: ""
+      MEMCACHEDCLOUD_PASSWORD: ""
+      GITHUB_CLIENT_ID: ""
+      GITHUB_CLIENT_SECRET: ""
+      WEB_CONCURRENCY: ""
+