David Calavera
85d7bbf7aa
Merge pull request #17528 from LK4D4/todisk_encode
...
Use json.Encoder for container.toDisk
2015-10-30 14:36:42 -07:00
Nathan LeClaire
70e137991d
Fix DriverName missing in 0.3.1 => 0.5.0 migration
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Signed-off-by: David Gageot <david@gageot.net >
2015-10-30 14:22:52 -07:00
Tibor Vass
74362e8392
Merge pull request #17531 from crosbymichael/no-set-reservation
...
Don't set mem soft limit if not specifiecd
2015-10-30 17:01:36 -04:00
Alexandre Beslic
8d7d51190d
Merge pull request #17541 from aboch/uc
...
Modify IPAMConfig structure json tags
2015-10-30 14:01:13 -07:00
David Calavera
f301c5765a
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-10-30 16:55:21 -04:00
John Howard
9d14866d71
Windows: Refactor execdriver.Command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-30 13:53:00 -07:00
John Howard
805dd0eeed
Windows: Native ANSI console support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-30 13:44:04 -07:00
Richard Scothern
ef17db8d73
Merge pull request #1122 from RichardScothern/scheduler-coalesce
...
Buffer writes to scheduler state file.
2015-10-30 13:43:07 -07:00
Mike Brown
b1da9fcc84
putting in support for rmi id for legacy docker.io/name images in local repositories
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
2015-10-30 15:28:12 -05:00
Ying Li
fa5c4e608d
Merge pull request #256 from mtrmac/fix-import-root
...
Remove key ID from (notary key import-root)
2015-10-30 13:23:33 -07:00
Ying Li
e2c6e989e9
Merge pull request #259 from mtrmac/drop-debug-print
...
Remove a left-over debugging Println
2015-10-30 13:15:49 -07:00
Alessandro Boch
d795bc7d53
Modify IPAMConfig structure json tags
...
- So that it complies with docker convention for inspect
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-30 12:57:49 -07:00
Daniel Nephin
be6b811c4e
Bump 1.5.0rc3
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:53:17 -04:00
Daniel Nephin
bdb9a280bc
Make storage driver configurable in CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:53:16 -04:00
Daniel Nephin
73ca4eb599
On error print daemon logs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:46:57 -04:00
Daniel Nephin
569ccbadec
Convert the README to rst and fix the logo url before packaging it up for pypi.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:46:57 -04:00
Daniel Nephin
ed1b584c42
Fix release script notes about software and typos.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:46:57 -04:00
Miloslav Trmač
40bfc3f890
Don't use elliptic.P224()
...
This curve is not available on Fedora and RHEL systems, so removing the
reference allows tests to pass there. Vast majority of the
curve-specific work is done in the golang crypto/elliptic package, so
this does not weaken the tests noticeably.
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-30 20:44:05 +01:00
Brian Goff
78bd17e805
Force IPC mount to unmount on daemon shutdown/init
...
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.
This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-10-30 15:41:48 -04:00
Miloslav Trmač
62dc66e936
Remove key ID from (notary key import-root)
...
PR #242 has started requiring a passphrase for the imported key, and
recomputes the key ID, making the command-line argument redundant. So,
remove it from the command line and from the KeyStoreManager API.
Also updates the comment for KeyStoreManager.ImportRootKey, and changes
(notary key import-root) to refuse unexpected arguments instead of
silently ignoring them.
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-30 20:40:03 +01:00
Miloslav Trmač
93c28ccb1b
Fix (notary key export-root)
...
-c was recently taken over by --configFile; using it for
--change-passphrase as well results in
panic: shorthand redefinition
So, move --change-passphrase to -p.
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-30 20:39:20 +01:00
Miloslav Trmač
c2d560c789
Remove a left-over debugging Println
...
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-10-30 20:38:41 +01:00
Daniel Nephin
2f2e946907
Don't set a default network driver, let the server decide.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:36:15 -04:00
Daniel Nephin
d392f70cc6
Fixes #1843 , #1936 - chown files back to host user in django example.
...
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:36:15 -04:00
Daniel Nephin
db164cefd3
Remove the duplicate 'Warning' prefix now that the logger adds the prefix.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:36:15 -04:00
Daniel Nephin
4d613d3ba7
Use colors when logging warnings or errors, so they are more obvious.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 15:36:15 -04:00
Joffrey F
1f26841e23
Integration test for run command with networking enabled
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-10-30 15:36:15 -04:00
Joffrey F
9370cb033c
Ensure network exists when calling run before up
...
Otherwise the daemon will error out because the network doesn't exist
yet.
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-10-30 15:36:15 -04:00
Daniel Nephin
77e1fe1915
Merge pull request #2295 from dnephin/default_network_should_be_none
...
Don't set a default network driver, let the server decide
2015-10-30 15:29:30 -04:00
Tibor Vass
a154b95d06
Merge pull request #17536 from aboch/uc
...
Modify Network structures json tags
2015-10-30 15:28:38 -04:00
Shijiang Wei
e41eae8b42
fix a race in json logger reader
...
The json decoder starts to decode immediately an inotify event is
received.
But at the time the inotify event is trigged, the json log
entry might haven't been fully written to the disk.
In this case the decoder will return an "io.UnexpectedEOF" error, but
there is still data remaining in the decoder's buffer. And the data
should be passed to the decoder when the next inotify event is
triggered.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-10-31 02:28:23 +08:00
Alessandro Boch
b2d0b75018
Modify Network structure json tags
...
- So that they comply with docker inspect convention
Which is allowing camel case for json field names
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-30 11:23:59 -07:00
Diogo Mónica
29f5a4523c
Merge pull request #254 from endophage/cryptoservice_multiple_keystores
...
cryptoservices can abstract multiple keystores
2015-10-30 11:21:52 -07:00
John Howard
d5c85897f4
Windows: Allows --isolation on docker build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-30 11:14:38 -07:00
David Lawrence
9428beea50
expose cryptoservice in NotarySigner
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-30 11:08:35 -07:00
David Lawrence
f791c01974
cryptoservices can abstract multiple keystores
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-30 11:05:43 -07:00
Jess Frazelle
0aa3bff482
Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild
...
Build broken on master (awslogs)
2015-10-30 10:39:48 -07:00
Brian Goff
17a8fbeaeb
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
2015-10-30 13:38:27 -04:00
Michael Crosby
ecb87ed0a5
Don't set mem soft limit if not specifiecd
...
You cannot do this for individual cgroups for all the containers. Only
set the reservation if the user requested it. The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-10-30 10:34:01 -07:00
Ying Li
e5c388d470
Merge pull request #246 from endophage/private_signer
...
Private keys implement crypto.Signer
2015-10-30 10:33:46 -07:00
Daniel Nephin
66ef2519d3
Merge pull request #2265 from dnephin/volumes_in_guides_doc
...
Update tutorials and small fix with rails tutorial
2015-10-30 13:30:00 -04:00
Steven Lee
30b8491180
Update for new nsqio image
...
nsqio have changed they way the package the binaries into docker. There is now one image with all the binaries in it and each one is called on run.
This should fix the docker compose as per http://nsq.io/deployment/docker.html
Signed-off-by: Steven Lee <steven.lee@multiplay.co.uk >
2015-10-30 17:19:06 +00:00
David Lawrence
06990fd5a1
integreating with @cyli's improvements
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-30 10:15:52 -07:00
moxiegirl
aa832d0197
Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions
...
Fix ubuntu installation instructions page
2015-10-30 10:10:04 -07:00
moxiegirl
f714118439
Merge pull request #17447 from ehaydenr/master
...
Update kill.md
2015-10-30 10:07:44 -07:00
John Howard
2716e3964d
Windows build broken on master (awslogs)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-30 10:02:32 -07:00
Daniel Nephin
c7d164d01c
Fixes #1843 , #1936 - chown files back to host user in django example.
...
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 12:42:15 -04:00
Tibor Vass
c545dce004
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
2015-10-30 12:38:40 -04:00
Michael Crosby
aadae4b503
Merge pull request #16412 from Microsoft/10662-hyper-v-containers
...
Windows [TP4]: Adds support for Hyper-V Containers
2015-10-30 09:34:16 -07:00
Alexander Morozov
cf02b369e0
Use json.Encoder for container.toDisk
...
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-10-30 09:29:53 -07:00