Merge remote-tracking branch 'origin/develop'

Jean-Beru · Jul 30, 2016 · d30e705 · d30e705
2 parents 81ea79b + 797d705
commit d30e705
Show file tree

Hide file tree

Showing 5 changed files with 1,692 additions and 310 deletions.
diff --git a/composer.json b/composer.json
@@ -4,9 +4,12 @@
     "type": "project",
     "description": "Update /etc/hosts to access running containers",
     "keywords": ["docker", "hosts"],
+    "repositories": [
+        {"type": "vcs", "url": "https://github.com/iamluc/docker-php.git"}
+    ],
     "require": {
-        "stage1/docker-php": "@dev",
-        "symfony/console": "^3.0"
+        "symfony/console": "^2.8|^3.0",
+        "docker-php/docker-php": "dev-compat-docker-1.12"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.1"