diff --git a/composer.lock b/composer.lock index 3311b11..01cd713 100644 --- a/composer.lock +++ b/composer.lock @@ -91,16 +91,16 @@ }, { "name": "docker-php/docker-php", - "version": "1.22.0", + "version": "1.22.1", "source": { "type": "git", "url": "https://github.com/docker-php/docker-php.git", - "reference": "1b87500f110f2ee89a5fce75c5b6f9faf85956ee" + "reference": "07ea063f90e8e87c2713b3db59918a937a165cf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/docker-php/docker-php/zipball/1b87500f110f2ee89a5fce75c5b6f9faf85956ee", - "reference": "1b87500f110f2ee89a5fce75c5b6f9faf85956ee", + "url": "https://api.github.com/repos/docker-php/docker-php/zipball/07ea063f90e8e87c2713b3db59918a937a165cf3", + "reference": "07ea063f90e8e87c2713b3db59918a937a165cf3", "shasum": "" }, "require": { @@ -134,7 +134,7 @@ "MIT" ], "description": "A Docker PHP client", - "time": "2016-02-09 01:21:49" + "time": "2016-03-06 20:07:35" }, { "name": "doctrine/inflector", @@ -321,16 +321,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.0.3", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" + "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", - "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", + "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", "shasum": "" }, "require": { @@ -368,7 +368,7 @@ "keywords": [ "promise" ], - "time": "2015-10-15 22:28:00" + "time": "2016-03-08 01:15:46" }, { "name": "guzzlehttp/psr7", @@ -430,21 +430,21 @@ }, { "name": "jane/jane", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/jolicode/jane.git", - "reference": "85b93543351e25eb38140797a9d382a17bbb45ef" + "reference": "af6e0a570443b9c41e9a68ef76b19b10fee84214" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jolicode/jane/zipball/85b93543351e25eb38140797a9d382a17bbb45ef", - "reference": "85b93543351e25eb38140797a9d382a17bbb45ef", + "url": "https://api.github.com/repos/jolicode/jane/zipball/af6e0a570443b9c41e9a68ef76b19b10fee84214", + "reference": "af6e0a570443b9c41e9a68ef76b19b10fee84214", "shasum": "" }, "require": { "doctrine/inflector": "^1.0", - "nikic/php-parser": "^1.4", + "nikic/php-parser": "^1.4|^2.0", "symfony/console": "^2.3|^3.0", "symfony/property-access": "^2.3|^3.0", "symfony/serializer": "^2.3|^3.0", @@ -485,26 +485,26 @@ } ], "description": "Generate a serializable / deserializable object model given a json schema", - "time": "2016-02-19 17:05:37" + "time": "2016-03-06 17:46:56" }, { "name": "jane/open-api", - "version": "v1.1.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/jolicode/jane-openapi.git", - "reference": "bcad4557d0a50ae008d3402e41b9617e608e9ef3" + "reference": "65fe879139b8eaad18d132e850cebadd85f88dca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jolicode/jane-openapi/zipball/bcad4557d0a50ae008d3402e41b9617e608e9ef3", - "reference": "bcad4557d0a50ae008d3402e41b9617e608e9ef3", + "url": "https://api.github.com/repos/jolicode/jane-openapi/zipball/65fe879139b8eaad18d132e850cebadd85f88dca", + "reference": "65fe879139b8eaad18d132e850cebadd85f88dca", "shasum": "" }, "require": { "doctrine/inflector": "^1.0", - "jane/jane": "^1.1.0", - "nikic/php-parser": "^1.4", + "jane/jane": "^1.2.0", + "nikic/php-parser": "^1.4|^2.0", "php-http/httplug": "^1.0", "php-http/message-factory": "^1.0", "symfony/console": "^2.3|^3.0", @@ -552,36 +552,42 @@ "openapi", "swagger" ], - "time": "2016-02-01 21:31:36" + "time": "2016-03-06 19:36:56" }, { "name": "nikic/php-parser", - "version": "v1.4.1", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51" + "reference": "ce5be709d59b32dd8a88c80259028759991a4206" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", - "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ce5be709d59b32dd8a88c80259028759991a4206", + "reference": "ce5be709d59b32dd8a88c80259028759991a4206", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3" + "php": ">=5.4" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "files": [ - "lib/bootstrap.php" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -597,7 +603,7 @@ "parser", "php" ], - "time": "2015-09-19 14:15:08" + "time": "2016-02-28 19:48:28" }, { "name": "padraic/humbug_get_contents", @@ -762,6 +768,70 @@ ], "time": "2016-01-27 10:22:14" }, + { + "name": "php-http/discovery", + "version": "v0.8.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/discovery.git", + "reference": "fac1240e8a070b3e2f0e38606941de80c849fa53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/discovery/zipball/fac1240e8a070b3e2f0e38606941de80c849fa53", + "reference": "fac1240e8a070b3e2f0e38606941de80c849fa53", + "shasum": "" + }, + "require": { + "php": "^5.4|7.*" + }, + "require-dev": { + "henrikbjorn/phpspec-code-coverage": "^1.0", + "php-http/httplug": "^1.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^2.4", + "puli/composer-plugin": "1.0.0-beta9" + }, + "suggest": { + "php-http/message": "Allow to use Guzzle or Diactoros factories", + "puli/composer-plugin": "Sets up Puli which is required for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details." + }, + "bin": [ + "bin/puli.phar" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.9-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds installed HTTPlug implementations and PSR-7 message factories", + "homepage": "http://httplug.io", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message" + ], + "time": "2016-02-11 09:53:37" + }, { "name": "php-http/httplug", "version": "v1.0.0", @@ -820,16 +890,16 @@ }, { "name": "php-http/message", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "24f87eb1e913bd8d548b6571be584492d95b0f02" + "reference": "a3b45d51ae5a7e800b857d2424792fe26c7dcd63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/24f87eb1e913bd8d548b6571be584492d95b0f02", - "reference": "24f87eb1e913bd8d548b6571be584492d95b0f02", + "url": "https://api.github.com/repos/php-http/message/zipball/a3b45d51ae5a7e800b857d2424792fe26c7dcd63", + "reference": "a3b45d51ae5a7e800b857d2424792fe26c7dcd63", "shasum": "" }, "require": { @@ -882,7 +952,7 @@ "message", "psr-7" ], - "time": "2016-01-27 11:42:19" + "time": "2016-02-25 10:37:53" }, { "name": "php-http/message-factory", @@ -1050,20 +1120,21 @@ }, { "name": "php-http/socket-client", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/socket-client.git", - "reference": "84cfa0bca447790ca2918c31b11e8316ba3e1d88" + "reference": "1c7c6e5fddaf1f0a457a69a3c17c550321b56a2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/socket-client/zipball/84cfa0bca447790ca2918c31b11e8316ba3e1d88", - "reference": "84cfa0bca447790ca2918c31b11e8316ba3e1d88", + "url": "https://api.github.com/repos/php-http/socket-client/zipball/1c7c6e5fddaf1f0a457a69a3c17c550321b56a2f", + "reference": "1c7c6e5fddaf1f0a457a69a3c17c550321b56a2f", "shasum": "" }, "require": { "php": ">=5.4", + "php-http/discovery": "^0.8", "php-http/httplug": "^1.0", "php-http/message-factory": "^1.0.2", "symfony/options-resolver": "^2.6|^3.0" @@ -1073,19 +1144,16 @@ }, "require-dev": { "guzzlehttp/psr7": "^1.2", - "php-http/adapter-integration-tests": "dev-master", - "php-http/client-common": "0.2.0", - "php-http/discovery": "^0.8@dev", - "php-http/message": "^0.2@dev", - "phpunit/phpunit": "^4.8" - }, - "suggest": { - "php-http/discovery": "Used for message factory discovery" + "php-http/adapter-integration-tests": "~0.3.1", + "php-http/client-common": "^1.0", + "php-http/message": "^1.0", + "phpunit/phpunit": "^4.8", + "puli/composer-plugin": "1.0.0-beta9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1104,7 +1172,7 @@ } ], "description": "Socket client for PHP-HTTP", - "time": "2016-01-26 15:15:24" + "time": "2016-02-25 10:31:40" }, { "name": "psr/cache", @@ -1241,16 +1309,16 @@ }, { "name": "symfony/console", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0" + "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0", - "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0", + "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04", + "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04", "shasum": "" }, "require": { @@ -1297,20 +1365,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-02-02 13:44:19" + "time": "2016-02-28 16:24:34" }, { "name": "symfony/filesystem", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f" + "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f", - "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/23ae8f9648d0a7fe94a47c8e20e5bf37c489a451", + "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451", "shasum": "" }, "require": { @@ -1346,11 +1414,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-01-27 11:34:55" + "time": "2016-02-23 15:16:06" }, { "name": "symfony/options-resolver", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -1404,7 +1472,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -1463,7 +1531,7 @@ }, { "name": "symfony/process", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -1512,16 +1580,16 @@ }, { "name": "symfony/property-access", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "95363dbabd606e404b6c75095669993bf7ddae4b" + "reference": "f138bcc0cdaf6a6aba99ecab20d235b394f46eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/95363dbabd606e404b6c75095669993bf7ddae4b", - "reference": "95363dbabd606e404b6c75095669993bf7ddae4b", + "url": "https://api.github.com/repos/symfony/property-access/zipball/f138bcc0cdaf6a6aba99ecab20d235b394f46eba", + "reference": "f138bcc0cdaf6a6aba99ecab20d235b394f46eba", "shasum": "" }, "require": { @@ -1568,11 +1636,11 @@ "property path", "reflection" ], - "time": "2016-01-03 15:35:16" + "time": "2016-02-13 09:23:44" }, { "name": "symfony/serializer", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", @@ -1635,16 +1703,16 @@ }, { "name": "symfony/yaml", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a" + "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3cf0709d7fe936e97bee9e954382e449003f1d9a", - "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b5ba64cd67ecd6887f63868fa781ca094bd1377c", + "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c", "shasum": "" }, "require": { @@ -1680,7 +1748,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-02-02 13:44:19" + "time": "2016-02-23 15:16:06" } ], "packages-dev": [], diff --git a/git-deployer.sublime-workspace b/git-deployer.sublime-workspace index d471f83..3382ec9 100644 --- a/git-deployer.sublime-workspace +++ b/git-deployer.sublime-workspace @@ -3,6 +3,10 @@ { "selected_items": [ + [ + "And", + "Andalucía" + ], [ "param", "$parameters〔variable〕" @@ -376,7 +380,7 @@ "buffers": [ { - "contents": "Remote: origin @ git@github.com:relamptk/git-deployer.git\nLocal: master ~/ownCloud/Projects/git-deployer\nHead: f13aae7 Few more fixes for new dependencies\n\n\nNothing to commit (working directory clean)\n\n# Movement:\n# r = refresh status\n# 1-5 = jump to section\n# n = next item, N = next section\n# p = previous item, P = previous section\n#\n# Staging:\n# s = stage file/section, S = stage all unstaged files\n# ctrl+shift+s = stage all unstaged and untracked files\n# u = unstage file/section, U = unstage all files\n# backspace = discard file/section, shift+backspace = discard everything\n#\n# Commit:\n# c = commit, C = commit -a (add unstaged)\n# ctrl+shift+c = commit --amend (amend previous commit)\n#\n# Other:\n# i = ignore file, I = ignore pattern\n# enter = open file\n# d = view diff\n#\n# Stashes:\n# a = apply stash, A = pop stash\n# z = create stash, Z = create stash including untracked files\n# backspace = discard stash", + "contents": "Remote: origin @ git@github.com:relamptk/git-deployer.git\nLocal: master ~/ownCloud/Projects/git-deployer\nHead: c57fa1c Fix ports without protocol\n\n\nChanges:\n Modified git-deployer.sublime-workspace\n\n\n# Movement:\n# r = refresh status\n# 1-5 = jump to section\n# n = next item, N = next section\n# p = previous item, P = previous section\n#\n# Staging:\n# s = stage file/section, S = stage all unstaged files\n# ctrl+shift+s = stage all unstaged and untracked files\n# u = unstage file/section, U = unstage all files\n# backspace = discard file/section, shift+backspace = discard everything\n#\n# Commit:\n# c = commit, C = commit -a (add unstaged)\n# ctrl+shift+c = commit --amend (amend previous commit)\n#\n# Other:\n# i = ignore file, I = ignore pattern\n# enter = open file\n# d = view diff\n#\n# Stashes:\n# a = apply stash, A = pop stash\n# z = create stash, Z = create stash including untracked files\n# backspace = discard stash", "settings": { "buffer_size": 971, @@ -385,6 +389,14 @@ "read_only": true, "scratch": true } + }, + { + "file": "src/GitDeployer/Deployers/DockerDeployer.php", + "settings": + { + "buffer_size": 16802, + "line_ending": "Unix" + } } ], "build_system": "", @@ -395,9 +407,17 @@ "command_palette": { "height": 138.0, - "last_filter": "push", + "last_filter": "psuh", "selected_items": [ + [ + "psuh", + "Git: Push" + ], + [ + "commit", + "Git: Commit" + ], [ "push", "Git: Push Current Branch" @@ -454,10 +474,6 @@ "pus", "Git: Push" ], - [ - "commit", - "Git: Commit" - ], [ "pu", "Git: Push" @@ -525,16 +541,19 @@ "/home/beniwtv/ownCloud/Projects/git-deployer/src", "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer", "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer/Commands", + "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer/Deployers", + "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer/Objects", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php" ], "file_history": [ + "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php/generated/Resource/ContainerResource.php", + "/home/beniwtv/ownCloud/Projects/rancho-andalucia.es/html-template.html", "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer/Deployers/DockerDeployer.php", "/home/beniwtv/ownCloud/Projects/git-deployer/src/GitDeployer/Commands/DeployCommand.php", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/jane/open-api/src/Client/QueryParam.php", - "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php/generated/Resource/ContainerResource.php", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php/generated/Model/PortBinding.php", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php/generated/Model/ContainerConfig.php", "/home/beniwtv/ownCloud/Projects/git-deployer/vendor/docker-php/docker-php/generated/Model/HostConfig.php", @@ -657,12 +676,11 @@ "/home/beniwtv/Documents/CodeRepos/translacia.com/web/bundles/wwbstranslaciasite/components/modernizr/test/caniuse_files/ga.js", "/home/beniwtv/Documents/CodeRepos/translacia.com/web/bundles/wwbstranslaciasite/components/angulartics/samples/google-analytics.html", "/home/beniwtv/Documents/CodeRepos/translacia.com/app/cache/dev/sp_bower/bower.json", - "/home/beniwtv/Documents/CodeRepos/translacia.com/vendor/sp/bower-bundle/Sp/BowerBundle/composer.json", - "/home/beniwtv/Documents/CodeRepos/translacia.com/vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml" + "/home/beniwtv/Documents/CodeRepos/translacia.com/vendor/sp/bower-bundle/Sp/BowerBundle/composer.json" ], "find": { - "height": 35.0 + "height": 38.0 }, "find_in_files": { @@ -686,6 +704,9 @@ "case_sensitive": false, "find_history": [ + "create(", + "create", + "Geor", "setDefaults", "configureOptions", "buildQueryString", @@ -787,7 +808,7 @@ "groups": [ { - "selected": 0, + "selected": 1, "sheets": [ { @@ -802,8 +823,8 @@ "selection": [ [ - 626, - 626 + 242, + 242 ] ], "settings": @@ -822,6 +843,36 @@ "translation.y": 0.0, "zoom_level": 1.0 }, + "stack_index": 1, + "type": "text" + }, + { + "buffer": 1, + "file": "src/GitDeployer/Deployers/DockerDeployer.php", + "semi_transient": false, + "settings": + { + "buffer_size": 16802, + "regions": + { + }, + "selection": + [ + [ + 12674, + 12674 + ] + ], + "settings": + { + "auto_complete": false, + "incomplete_sync": null, + "syntax": "Packages/PHP/PHP.sublime-syntax" + }, + "translation.x": 0.0, + "translation.y": 5389.0, + "zoom_level": 1.0 + }, "stack_index": 0, "type": "text" } diff --git a/src/GitDeployer/Deployers/DockerDeployer.php b/src/GitDeployer/Deployers/DockerDeployer.php index 690288e..5a01c77 100644 --- a/src/GitDeployer/Deployers/DockerDeployer.php +++ b/src/GitDeployer/Deployers/DockerDeployer.php @@ -268,8 +268,11 @@ public function deploy(\GitDeployer\Objects\Project $project, $gitpath, $config) } $containerConfig->setHostConfig($hostConfig); - $containerCreateResult = $docker->getContainerManager()->create($containerConfig); - $docker->getContainerManager()->start($containerCreateResult->getId()); + $containerCreateResult = $docker->getContainerManager()->create($containerConfig, array('name' => $this->cleanName($project->name()))); + + if ($containerCreateResult->getId()) { + $docker->getContainerManager()->start($containerCreateResult->getId()); + } // -> Clean up and close the SSH tunnel if ($useTunnel) {