update schema + fix travis

Author: maxpou

.travis.yml

@@ -7,11 +7,23 @@ services:
   - docker
 
 before_install:
-  - mkdir symfony
+    # docker install
+  - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list'
+  - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+  - sudo apt-get update
+  - sudo apt-key update
+  - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise
   - sudo rm /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
+  - docker-compose -v
+  - docker -v
+  # symfony application folder
+  - mkdir symfony
+  - line_old='../../sites/lab/symfony-rest-beer-edition:/var/www/symfony'
+  - line_new='symfony:/var/www/symfony'
+  - sed -i "s%$line_old%$line_new%g" docker-compose.yml
 
 script:
   - docker-compose up -d

README.md

@@ -2,9 +2,7 @@
 
 [![Build Status](https://travis-ci.org/maxpou/docker-symfony.svg?branch=master)](https://travis-ci.org/maxpou/docker-symfony)
 
-*Credit: this is a kind of fork from [eko/docker-symfony](https://github.com/eko/docker-symfony). Thanks to him :-)*
-
-![](http://www.maxpou.fr/images/articles/symfony-docker/schema.png)
+![](http://www.maxpou.fr/images/articles/symfony-docker/schema-v2.png)
 
 ## Installation
 
@@ -14,7 +12,15 @@
     $ git clone https://github.com/maxpou/docker-symfony
     ```
 
-2. Move your Symfony project into symfony folder
+2. In the docker-compose file, indicate where's your Symfony project
+
+    ```yml
+    services:
+        php:
+            volumes:
+                - path/to/your/symfony-project:/var/www/symfony
+    ```
+
 3. Build containers with (with and without detached mode)
 
     ```bash
@@ -40,7 +46,7 @@
 
         **Note:** If it's empty, run `docker inspect $(docker ps -f name=db -q) | grep IPAddress` instead.
 
-    2. Update app/config/parameters.yml (adapt hosts according to previous results)
+    2. Update app/config/parameters.yml
 
         ```yml
         # path/to/sfApp/app/config/parameters.yml
@@ -158,7 +164,4 @@ Also, while creating your Pull Request on GitHub, please write a description whi
 
 ## TODO
 
-- [ ] Update diagram:
-    * indicate ES/Kibana ports
-    * remove code container
 - [ ] Upgrade ELK stack + install [Timelion](https://github.com/elastic/timelion) plugin <3