Tianon Gravi
179e9deb1a
Adjust Dockerfile style to be more consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2014-12-24 00:26:19 -07:00
Tianon Gravi
4baa240065
Merge pull request #9802 from icecrime/9284_tianon_ocd
...
Fix indentation
2014-12-23 22:42:38 -08:00
Arnaud Porterie
6c7204393b
Fix indentation
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2014-12-23 22:01:04 -08:00
Olivier Gambier
6aa51bb7f1
Merge pull request #2 from docker/fix-refs
...
Move from docker-registry to distribution
2014-12-23 21:24:39 -08:00
Victor Vieux
9f75d0eb37
add node name, ID and IP
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-24 01:23:18 +00:00
Olivier Gambier
67ca9d10cf
Move from docker-registry to distribution
2014-12-23 17:13:02 -08:00
Olivier Gambier
83b810104c
Merge pull request #4 from stevvooe/master
...
Merge missing commits
2014-12-23 17:09:09 -08:00
Stephen J Day
bd631a32b3
Merge remote-tracking branch 'upstream-registry/next-generation'
2014-12-23 16:35:16 -08:00
Victor Vieux
bbb92e1436
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-24 00:12:35 +00:00
Olivier Gambier
5cd308f829
Merge pull request #1 from icecrime/import-next-generation
...
Import docker-registry/next-generation branch
2014-12-23 15:54:09 -08:00
Michael Crosby
305c898cd7
Merge pull request #9795 from LK4D4/update_libcontainer
...
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
2014-12-23 15:41:26 -08:00
Arnaud Porterie
ae55a8232f
Import next-generation branch
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2014-12-23 15:32:00 -08:00
Phil Estes
44cab4a4ff
Add "OOM killed" event based on OOM state information
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2014-12-23 18:22:31 -05:00
Tianon Gravi
edbf1ed680
Add github.com/go-fsnotify/fsnotify
...
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com >
2014-12-23 18:17:39 -05:00
Olivier Gambier
6612be9acb
Merge pull request #868 from stevvooe/ng-api-specification
...
[WIP] Automatically generate V2 API specification
2014-12-23 15:14:39 -08:00
Olivier Gambier
e33c5d90b2
Merge pull request #864 from AndreyKostov/next-generation
...
S3 storage driver for next gen modifications
2014-12-23 15:03:10 -08:00
Victor Vieux
4b43a6df7a
add ExecIDs in inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-23 22:03:20 +00:00
Alexander Morozov
8dc86c0e36
More graceful stop for testing daemon
...
Fixes problem with TestDaemonAllocatesListeningPort
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2014-12-23 13:15:19 -08:00
Jessica Frazelle
7fdbd90f88
Return usage on parseExec error.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-23 12:49:45 -08:00
Alexander Morozov
50905a6d6c
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
...
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2014-12-23 12:10:03 -08:00
Victor Vieux
8412e3c226
Merge pull request #9791 from proppy/break
...
api/server: commenting proppy from maintainer
2014-12-23 11:05:33 -08:00
Johan Euphrosine
4fd2a9156c
api/server: commenting proppy from maintainer
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
2014-12-23 11:01:27 -08:00
Jessie Frazelle
ed49db8984
Merge pull request #9754 from tiborvass/remove-insecure-registry-all-ports
...
registry: remove accidentally added --insecure-registry feature
2014-12-23 10:40:10 -08:00
Alexander Morozov
1e2d0d17d9
Merge pull request #9583 from brahmaroutu/remove_container_9569
...
Error should be 409 as the container is different state to remove
2014-12-23 10:09:58 -08:00
Tianon Gravi
084bf8a864
Merge pull request #9756 from tianon/clarify-btrfs-version-dep
...
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
2014-12-23 09:25:55 -08:00
Andrey Kostov
da6e2f96ec
S3 driver input parameter fixes
2014-12-23 10:54:01 +02:00
Evan Hazlett
103484c4a8
use ubuntu 14.04 in azure; fix port errors and endpoint issues
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2014-12-23 00:20:37 -05:00
Alexander Morozov
043e33c2c1
Merge pull request #9757 from lindenlab/9712-validTagName-errormessage
...
Fixing ValidateTagName error message #9712
2014-12-22 21:17:03 -08:00
Victor Vieux
174f664b3f
fix attach
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-23 02:20:13 +00:00
Jessie Frazelle
034ba8b88f
Merge pull request #9765 from thaJeztah/improve-error-message-3036
...
Improve error message for conflicting container name.
2014-12-22 18:02:48 -08:00
Sven Dowideit
7a3efc9aa5
Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16
...
Debian Wheezy backports kernel updated to 3.16
2014-12-23 11:19:26 +10:00
panticz
973c3c768b
Debian Wheezy backports kernel updated to 3.16
...
Replaces #9723
fix by: panticz <mail@konczalski.de > (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2014-12-23 11:14:14 +10:00
Sven Dowideit
197281f585
Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested
...
Login with PUTTY instead of using the CMD
2014-12-23 11:11:53 +10:00
Sven Dowideit
db165f7d2c
fixes as requested
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-12-23 11:06:45 +10:00
Krasimir Georgiev
948f33263e
Changing the windows installation doc to include instructions how to login
...
using putty instead of CMD
Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk >
Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk > (github: SvenDowideit)
2014-12-23 11:06:44 +10:00
Sven Dowideit
dda2b19439
Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7
...
Update Debian version to 7.7
2014-12-23 11:02:50 +10:00
panticz
491ff81a0b
Update Debian version to 7.7
...
Replaces #9724
fix by: panticz <mail@konczalski.de > (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2014-12-23 10:53:36 +10:00
Victor Vieux
2365ec79e6
attach support
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-23 00:23:20 +00:00
Victor Vieux
a58043d354
Merge pull request #199 from vieux/log_errors
...
log all API errors
2014-12-22 16:22:22 -08:00
Jessie Frazelle
9f6feaa3c3
Merge pull request #9781 from mota/deadfunc-vfs-driver
...
Cleanup: Remove unused function from vfs storage driver
2014-12-22 16:17:53 -08:00
Victor Vieux
5edf3ceeb2
log all errors
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-23 00:13:26 +00:00
Olivier Gambier
5176c3e6b4
Initial commit
2014-12-22 15:49:26 -08:00
Pierre Wacrenier
c1e04fbb15
Remove unused function from vfs storage driver
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
2014-12-23 00:36:20 +01:00
Victor Vieux
29348a1041
Merge pull request #196 from nickschuch/master
...
Update discovery link
2014-12-22 15:24:15 -08:00
Jessie Frazelle
d09421a74f
Merge pull request #9615 from unclejack/bump_go_to_1.4
...
bump Go to 1.4
2014-12-22 15:07:57 -08:00
Alexander Morozov
04117e4021
Merge pull request #7003 from porjo/6034-fowardChain
...
Move per-container forward rules to DOCKER chain
2014-12-22 14:40:42 -08:00
Andrey Kostov
d296a3d2c0
First pass at cleanup for PR merge
2014-12-23 00:24:45 +02:00
Ben Firshman
82965024ea
Merge pull request #105 from nathanleclaire/cache_b2d_iso
...
Only download boot2docker.iso one time
2014-12-22 22:15:27 +00:00
Evan Hazlett
b86c37a215
Merge pull request #127 from bfirsh/roadmap
...
Add roadmap
2014-12-22 16:52:48 -05:00
Ben Firshman
dcf6c78011
Add roadmap
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-22 21:47:20 +00:00