From e3275b34ceb595eebd9a66dbbb076d9a01516c28 Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Sun, 15 Apr 2018 11:17:59 +0000
Subject: [PATCH] Update docker version

Update fig.yml to work
Update puma to not daemonize to work
Update dockerfile too

This version should work now.
---
 Dockerfile     | 1 +
 config/puma.rb | 2 +-
 fig.yml        | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea536ed..eb9b3b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,7 @@ RUN bundle install --path /var/bundle --jobs 4
 
 USER root
 
+# FIXME: move this to docker image
 RUN apt-get install -y memcached
 RUN service memcached start
 
diff --git a/config/puma.rb b/config/puma.rb
index 98409b2..ca304e2 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -10,7 +10,7 @@ stdout_path = "#{base_path}/lpuma.stdout.log"
 tag 'ENSL'
 
 preload_app!
-daemonize true
+daemonize false
 directory base_path
 pidfile "#{base_path}/tmp/puma.pid"
 state_path "#{base_path}/tmp/puma.state"
diff --git a/fig.yml b/fig.yml
index 4f008fa..a178931 100644
--- a/fig.yml
+++ b/fig.yml
@@ -1,11 +1,14 @@
 web:
   image: ensl
+  volumes:
+    - "/srv/ensl/public:/var/www/public"
+  ports: "4000:4000"
   links:
     - mysql
 #    - redis
 mysql:
-  image: mysql/mysql-server
+  image: mysql/mysql-server:5.7
   volumes:
-    - /srv/ensl/mysql:/var/lib/mysql
+    - "/srv/ensl/mysql:/var/lib/mysql"
 #redis:
 #  image: redis