Merge pull request #19 from rm-yakovenko/15-docker

15 docker-compose.dev.yml

Author: rm-yakovenko

.gitignore

@@ -1 +1,2 @@
-/.env
+/.env
+/docker-compose.override.yml

.travis.yml

@@ -7,6 +7,7 @@ script:
   - export MYSQL_ROOT_PASSWORD=root
   - cp .env.dist .env
   - XDEBUG=1 docker-compose build
+  - ln -sr docker-compose.dev.yml docker-compose.override.yml
   - docker/console php -i
   - docker-compose up -d
   - curl -f localhost:8080

README.md

@@ -6,7 +6,8 @@ Ready to run docker containers for php development.
 
 1. Copy `.env.dist` to `.env`.
 1. Configure `.env` if you need.
-1. Copy `.env`, `docker` and `docker-compose.yml` to your app's root folder.
+1. Copy `.env`, `docker`, `docker-compose.dev.yml` and `docker-compose.yml` to your app's root folder.
+1. Enable dev mode `ln -sr docker-compose.dev.yml docker-compose.override.yml`.
 1. Run `docker-compose up -d`.
 1. Open in your browser http://localhost:8080/ to access the app.
 

docker-compose.dev.yml

@@ -0,0 +1,13 @@
+version: '2'
+services:
+    db:
+        ports:
+            - 127.0.0.1:13306:3306
+
+    app:
+        volumes:
+            - ./docker/app/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini:ro
+
+    web:
+        ports:
+            - $LISTEN_WEB:80

docker-compose.yml

@@ -9,8 +9,6 @@ services:
         environment:
             - "MYSQL_ROOT_PASSWORD"
             - "MYSQL_DATABASE=app"
-        ports:
-            - 127.0.0.1:13306:3306
         volumes:
             - /etc/localtime:/etc/localtime:ro
 
@@ -28,13 +26,10 @@ services:
         volumes:
             - /etc/localtime:/etc/localtime:ro
             - ./docker/app/app.ini:/usr/local/etc/php/conf.d/app.ini:ro
-            - ./docker/app/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini:ro
             - ./:/var/www/app:rw
 
     web:
         image: nginx
-        ports:
-            - $LISTEN_WEB:80
         links:
             - app
         volumes: