Commit Graph

1653 Commits

Author SHA1 Message Date
Guillaume J. Charmes cd0de83917 Cereate a new registry object for each request (~session) 2013-05-28 17:12:24 -07:00
Guillaume J. Charmes e84306ca61 Merge pull request #730 from dotcloud/invert_status_created-fix
- Runtime: invert status created in docker ps
2013-05-28 15:45:52 -07:00
Guillaume J. Charmes f65327555e Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
* API: rename containers/ps to containers/json
2013-05-28 15:44:20 -07:00
Guillaume J. Charmes 7aa0d11171 Merge pull request #732 from dotcloud/718-return_no_such_container_as_404-fix
- API: return 404 on no such containers in /attach
2013-05-28 15:43:07 -07:00
Solomon Hykes 522f399d68 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-28 14:57:50 -07:00
Solomon Hykes 326faec664 De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo. 2013-05-28 14:57:36 -07:00
Thatcher 28a30eda88 Merge pull request #702 from kim0/patch-2
Properly install ppa, avoid GPG key warning. Also closes #715
2013-05-28 14:17:59 -07:00
Solomon Hykes 387eb5295a Removed deprecated SPECS directory 2013-05-28 14:13:20 -07:00
Thatcher f3cc1d985e Merge pull request #733 from meejah/master
Documentation: Use add-apt-repository instead of editing sources.list
2013-05-28 13:55:11 -07:00
Andy Rothfusz 235ae9cd43 Merge pull request #709 from dhrp/links-to-kernel-doc
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
2013-05-28 12:07:46 -07:00
meejah 444f7020cb Add sudo to commands. 2013-05-28 10:56:26 -06:00
meejah 525080100d Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you. 2013-05-28 10:54:32 -06:00
Victor Vieux e5fa4a4956 return 404 on no such containers in /attach 2013-05-28 16:19:12 +00:00
Victor Vieux 4f9443927e rename containers/ps to containers/json 2013-05-28 16:08:05 +00:00
Victor Vieux d9670f4275 invert status created 2013-05-28 15:06:26 +00:00
Ken Cochrane 3d8da80611 Merge pull request #729 from mmcgrana/fix-attach-api-docs
- Documentation: Fix attach API docs typo.
2013-05-28 06:53:41 -07:00
Mark McGranaghan 7d6ff7be12 Fix attach API docs. 2013-05-28 06:27:12 -07:00
Guillaume J. Charmes d3b9733507 Merge pull request #657 from offby1/master
Minor tweaks to python_web_app.rst
2013-05-24 19:19:32 -07:00
Solomon Hykes df23a1e675 * Registry: specified naming restrictions for usernames and repository names 2013-05-24 18:58:24 -07:00
Solomon Hykes bb4b35a892 Fix a unit test broken by pull request #703 2013-05-24 18:32:21 -07:00
Solomon Hykes 194f487749 Added FIXME about possible race condition in a unit test 2013-05-24 18:31:47 -07:00
Solomon Hykes 9775f0bd14 * Remote API: send push/pull progress bar as json 2013-05-24 17:59:27 -07:00
Guillaume J. Charmes a05bfb246f Merge pull request #710 from dotcloud/tty_resize
+ Tty: Handle terminal size and resize in tty mode
2013-05-24 15:12:22 -07:00
Guillaume J. Charmes b438565609 Fix merge issue 2013-05-24 14:48:13 -07:00
Guillaume J. Charmes ffd9e06deb Merge branch 'master' into tty_resize
Conflicts:
	commands.go
2013-05-24 14:45:31 -07:00
Guillaume J. Charmes 88ef309a94 Finish resize implementation client and server 2013-05-24 14:44:16 -07:00
Thatcher Peskens c5f15dcd3d Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst 2013-05-24 14:42:00 -07:00
Guillaume J. Charmes d8e60b797f Merge pull request #630 from dotcloud/check_if_logged_before_pull-fix
add login check before pull user's repo
2013-05-24 12:29:59 -07:00
Guillaume J. Charmes 064101d82e Merge pull request #689 from dotcloud/help_command-fix
- Runtime: bring Error: Command not found: <command>
2013-05-24 12:01:19 -07:00
Guillaume J. Charmes a3293ed854 Fix merge issue 2013-05-24 11:56:21 -07:00
Guillaume J. Charmes 3d1bc2660c Merge branch 'master' into help_command-fix
Conflicts:
	commands.go
2013-05-24 11:46:18 -07:00
Guillaume J. Charmes 48fd8ae79c Merge branch '573-add_host_port-feature' 2013-05-24 11:36:05 -07:00
Guillaume J. Charmes c167d603f2 Merge pull request #661 from dotcloud/573-add_host_port-feature
+ Runtime: add -H flag to listen/connect to different ip/port
2013-05-24 11:32:57 -07:00
Guillaume J. Charmes bfb65b733a Simplify the Host flag parsing 2013-05-24 11:31:36 -07:00
Guillaume J. Charmes ae72c2f4d6 Gofmt 2013-05-24 11:31:19 -07:00
Guillaume J. Charmes 0146f65a44 Fix issue within auth test 2013-05-24 11:31:11 -07:00
Guillaume J. Charmes deb9963e6e Catch sigwinch client 2013-05-24 11:07:32 -07:00
Victor Vieux d7b01c049d bump to master 2013-05-24 16:50:16 +00:00
Victor Vieux 92e4a51965 use -H 2013-05-24 16:49:18 +00:00
Victor Vieux 3c7bca7a21 first version of Pull 2013-05-24 16:34:03 +00:00
Ken Cochrane 1b5ab5afe0 Merge pull request #701 from kim0/patch-1
- Documentation: Updated ubuntu install docs to avoid hardcoding kernel 3.8 version, and allow Ubuntu updates to work
2013-05-24 08:58:02 -07:00
kim0 4e576f047f Properly install ppa, avoid GPG key warning 2013-05-24 18:55:32 +03:00
kim0 8dc2ad2c06 Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work 2013-05-24 17:44:02 +02:00
Victor Vieux 58ce66e553 Merge pull request #699 from dotcloud/docker_login-fix
fix docker login when same username
2013-05-24 07:32:38 -07:00
Victor Vieux 1f23b4caae fix docker login when same username 2013-05-24 14:23:43 +00:00
Victor Vieux 4dab2fccd3 removed useless params 2013-05-24 12:43:24 +00:00
Victor Vieux a7d7a06655 change %f to %g 2013-05-24 12:23:28 +00:00
Victor Vieux 9ebfcc9a15 bump to master 2013-05-24 12:17:44 +00:00
Guillaume J. Charmes 70d2123efd Add resize endpoint to api 2013-05-23 19:33:28 -07:00
Guillaume J. Charmes ecb64be6a8 Merge pull request #695 from dtzWill/694-fix-merge-config
- Runtime: utils.go: Fix merge logic for user and hostname.
2013-05-23 16:00:34 -07:00