Vincent Demeester
0736598b93
Remove hello-world:latest tag before integration
...
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-05 14:40:27 +01:00
Vincent Demeester
09ad1bbc58
Merge pull request #19070 from softprops/shiplift_client
...
add shiplift docker client to remote api client list
2016-01-05 14:36:30 +01:00
softprops
09e0c9fc24
add shiplift docker client to remote api client list
...
Signed-off-by: Doug Tangren <d.tangren@gmail.com>
2016-01-05 08:27:26 -05:00
Sebastiaan van Stijn
0439e03a27
Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent
...
Add zsh completion for 'docker daemon --cgroup-parent'
2016-01-05 13:12:02 +01:00
Sebastiaan van Stijn
4a4131ac1b
Merge pull request #19075 from HackToday/fixvoldoc
...
Fix the unnecessary parameter
2016-01-05 11:51:33 +01:00
Sebastiaan van Stijn
14a7048df9
Merge pull request #19064 from RichardScothern/registry-flag
...
Show the legacy registry flag only in the daemon arguments
2016-01-05 11:48:01 +01:00
Vincent Demeester
fccbbe5726
Merge pull request #19078 from HackToday/19072-fix-str
...
Fix the str missing
2016-01-05 11:34:36 +01:00
Kai Qiang Wu(Kennan)
52b944dbba
Fix the unnecessary parameter
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-05 10:26:01 +00:00
Sebastiaan van Stijn
cd9c641b1d
Merge pull request #19079 from wenchma/typo_error
...
Fix a typo error
2016-01-05 11:06:30 +01:00
Wen Cheng Ma
289faeac11
Fix a typo error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-05 17:42:13 +08:00
Kai Qiang Wu(Kennan)
01e873790e
Fix the str missing
...
Fixes : #19072
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-05 09:32:52 +00:00
Anthon van der Neut
8c1d0e31b4
example cannot work, pip needs --requirement
...
The example is not explicit, but the requirements.txt file is most likely a list of requirements (i.e. list of packages to be installed)
and not a python package itself. As such it needs the "--requirements" or "-r" option.
Signed-off-by: Anthon van der Neut <anthon@mnt.org>
2016-01-05 09:23:53 +01:00
Steve Durrheimer
b5f6605ca2
Add zsh completion for 'docker daemon --cgroup-parent'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-05 07:41:34 +01:00
David Calavera
ebc5a4654e
Merge pull request #19062 from anusha-ragunathan/cgroup
...
Add ability to set cgroup parent for all containers
2016-01-04 16:46:23 -08:00
Justin Cormack
d8e06d54cf
Allow sigreturn syscall
...
This is used on some 32 bit architectures, eg x86
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 16:11:59 -08:00
Jess Frazelle
78873dd6e5
Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
...
Adding Jenkins CI script to sources
2016-01-04 15:59:03 -08:00
John Howard
8213f8caaa
Adding Jenkins CI script to sources
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-04 15:53:30 -08:00
Alexander Morozov
2e3186ab06
Add ability to set cgroup parent for all containers
...
Fix #18022
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-04 15:16:25 -08:00
Jessica Frazelle
b46f044bf7
update volume name regex
...
Disallow creating a volume starting with a /.
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 15:00:49 -08:00
Richard Scothern
b18fadd115
Show the legacy registry flag only in the daemon arguments
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-04 14:52:39 -08:00
Michael Crosby
04234bd16a
Merge pull request #18208 from cpuguy83/restart_links
...
Daemon Restart: attempt to wait for container deps
2016-01-04 14:36:00 -08:00
David Calavera
723be0a332
Merge pull request #18888 from calavera/event_types
...
Event all the things!
2016-01-04 13:07:33 -08:00
David Calavera
851fe00c64
Add filter by event type and documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-04 14:58:04 -05:00
Justin Cormack
923609179b
Add _llseek syscall
...
This is the newer verion of lseek on many 32 bit platforms
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:28 -08:00
Justin Cormack
d6a9c5abed
Do not allow obsolete syscalls
...
sysfs and ustat syscalls are marked obsolete.
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:28 -08:00
Justin Cormack
c1b57fc1c9
Do not allow name_to_handle_at, as we have already blocked open_by_handle_at
...
Being able to obtain a file handle is no use as we cannot perform
any operation in it, and it may leak kernel state.
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-04 11:55:27 -08:00
Jessica Frazelle
a1747b3cc8
add 32bit syscalls to whitelist
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 11:55:26 -08:00
Jessica Frazelle
17735c3c98
change seccomp blacklist to whitelist
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-04 11:55:21 -08:00
Clinton Kitson
6084346bec
Updated docs for consolidated list of REX-Ray providers
...
This commit includes the correct project link and also
includes a consolidated list of drivers that are supported.
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
2016-01-04 11:28:25 -08:00
David Calavera
dc4ca0e897
Merge pull request #18941 from dnephin/runconfig_in_cli
...
Move runconfig/parse.go into the runconfig/opts package
2016-01-04 11:06:18 -08:00
David Calavera
972653c310
Merge pull request #19054 from calavera/remove_version_from_types
...
Remove version package from API types.
2016-01-04 10:54:47 -08:00
Jess Frazelle
fa57eedff4
Merge pull request #19002 from jfrazelle/update-test-images
...
cleanup test images
2016-01-04 10:24:30 -08:00
David Calavera
9961816ade
Remove version package from API types.
...
It's an internal type that only extends string.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-04 12:51:45 -05:00
Tonis Tiigi
a8f88ef403
Parallel migration and optimizations
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-04 09:48:52 -08:00
Tonis Tiigi
0641429ad8
Use direct filesystem access for tar-split on aufs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-04 09:41:02 -08:00
Sebastiaan van Stijn
fb893cf656
docs: add note to volume-plugins
...
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-04 18:28:14 +01:00
Daniel Nephin
c5a2fdb697
Move volume.SplitN() to the one place it is used in runconfig.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-04 12:06:30 -05:00
Daniel Nephin
2b7ad47bd2
Move the runconfig.Parse() function into the runconfig/opts package.
...
The parse.go file is used almost exclusively in the client. The few small
functions that are used outside of the client could easily be copied out
when the client is extracted, allowing this runconfig/opts package to
move to the client.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-04 12:06:29 -05:00
Daniel Nephin
4c0d586bd3
Move ParseExec to the client where it is used.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-04 12:06:29 -05:00
moxiegirl
0fae65e228
Merge pull request #18499 from thaJeztah/fix-run-reference-example
...
Fix pid=host example in documentation
2016-01-04 08:51:02 -08:00
moxiegirl
822a808688
Merge pull request #19048 from thaJeztah/update-configuring-docker
...
docs: update configuring docker for systemd
2016-01-04 08:46:45 -08:00
Sebastiaan van Stijn
9b6592ca85
Fix pid=host example in documentation
...
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.
This updates the example to use htop (strace is
not working without disabling apparmor for the container)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-04 16:25:54 +01:00
Brian Goff
0fff66977a
Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error
...
Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms
2016-01-04 10:22:10 -05:00
Sebastiaan van Stijn
59301e018c
docs: update configuring docker for systemd
...
Ubuntu 15.04 and above uses systemd. Add a note
in the docs to point users to the right instructions.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-04 15:26:55 +01:00
Wen Cheng Ma
d92d1de3d5
Update docker network api doc
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-04 18:05:02 +08:00
Sebastiaan van Stijn
db738dd77f
Merge pull request #15666 from vdemeester/3519-configurable-escape
...
Implement configurable escape key for attach/exec
2016-01-04 00:49:07 +01:00
Vincent Demeester
15aa2a663b
Implement configurable detach key
...
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration
- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
configure the default escape keys for docker client.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-03 23:03:39 +01:00
Sebastiaan van Stijn
2916ceb313
Merge pull request #19037 from moxiegirl/15666-file-carry
...
Creating a man page for the configuration file
2016-01-03 22:50:32 +01:00
Ingo Gottwald
f8c5420080
Fix race condition in JSONFileLogger.Log
...
Signed-off-by: Ingo Gottwald <in.gottwald@gmail.com>
2016-01-03 22:45:56 +01:00
Mary Anthony
32b5f71f0d
Creating a man page for the configuration file
...
Signed-off-by: Mary Anthony <mary@docker.com>
Adding comments. Fixing bit in daemon
Signed-off-by: Mary Anthony <mary@docker.com>
Arrrgggh
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-03 13:23:18 -08:00