Merge branch 'master' into production

2018-06-09 13:42:46 -05:00 · 2018-06-09 13:42:46 -05:00 · 7ee316f2b4
commit 7ee316f2b4
parent 4c9ef33f20 6ca63c2a99
1 changed files with 6 additions and 1 deletions
--- a/docker-compose-rlyeh.yml
+++ b/docker-compose-rlyeh.yml
@ -1,11 +1,16 @@
-version: '2'
+version: '3'

 services:
+  memcache:
+    image: memcached:1.5.4-alpine
+    command: memcached -m 512
+
  web:
    image: danelbert/parsley:production
    ports:
      - "7000:80"
    environment:
+      - RAILS_USE_MEMCACHE=true
      - PASSENGER_APP_ENV=production
    env_file: /etc/default/parsley
    volumes: