Merge remote-tracking branch 'github/master'

# Conflicts: # Makefile # docker-compose.dev.yml # docker-compose.override-dist.yml
dmstr · Feb 9, 2018 · 578a5fb · 578a5fb
1 parent 3f02ed5
commit 578a5fb
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -2,7 +2,7 @@
 #
 # Variables are populated with values from `.env`
 #
-version: '2'
+version: '2.1'
 services:
 
   php:
@@ -29,11 +29,6 @@ services:
       - ./composer.json:/app/composer.json:cached
       - ./composer.lock:/app/composer.lock:cached
 
-  worker:
-    build: .
-    depends_on:
-      - db
-
   db:
     #command: --character-set-server=utf8 --collation-server=utf8_general_ci
     image: percona:5.7