From a5a627dce49e29e07b62ac407ea981ce9af7e47e Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Sun, 22 Mar 2020 15:55:27 +0200
Subject: [PATCH] Fix dev env setup

---
 DEVELOPMENT.md         |  2 ++
 Dockerfile.dev         |  1 -
 docker-compose.dev.yml | 12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 19540d7..89762b3 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -29,7 +29,9 @@ Just run and open http://localhost:4000/
 
 ## Handy commands
 
+    docker-compose -f docker-compose.dev.yml exec -u root web /bin/bash`
     docker-compose -f docker-compose.dev.yml exec -u web web /bin/bash`
+    docker-compose -f docker-compose.dev.yml exec -u root test /bin/bash`
     docker-compose -f docker-compose.dev.yml exec -u web test /bin/bash`
     docker-compose -f docker-compose.dev.yml restart web`
     docker-compose -f docker-compose.dev.yml exec -u web test bundle exec rspec`
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 53c108f..4381726 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -29,5 +29,4 @@ RUN bundle config github.https true && \
     bundle config set path '/var/bundle' && \
     bundle install --jobs 8
 
-USER root
 CMD ["/var/www/bin/script/entry.sh"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 1f94559..f19c9ad 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,16 +2,17 @@ version: "3"
 
 services:
   web:
-    # Debug
+    command: "bundle exec puma"
+    tty: true
     stdin_open: true
-    command: /bin/bash 
-    tty: true 
+    # Debug
+    # command: /bin/bash
     container_name: ensl_dev
     build:
       context: ./
       dockerfile: Dockerfile.dev
-      args:
-        buildno: 1
+#      args:
+#        buildno: 1
     volumes:
      - ".:/var/www/"
     ports:
@@ -99,5 +100,6 @@ services:
 
   memcached:
     image: memcached:latest
+  
   #redis:
   #  image: redis