beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23276 commits 14 branches 412 tags 338 MiB
Commit graph

23276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
7512d3ce3b Merge pull request #21516 from sdurrheimer/zsh-completion-logopt-fluentd 
Add zsh completion for new fluentd log driver options
 2016-03-25 11:39:33 -07:00
Steve Durrheimer
396ffa2faf Add zsh completion for new fluentd log driver options 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 19:28:38 +01:00
David Calavera
786305ed0c Merge pull request #21486 from Microsoft/jjh/execroot 
Windows: Remove --exec-root
 2016-03-25 11:07:48 -07:00
David Calavera
73f8654759 Merge pull request #21493 from Microsoft/jjh/nativeconsole2 
Windows: Native console disableNewlineAutoReturn
 2016-03-25 11:07:18 -07:00
David Calavera
e811dab6a9 Merge pull request #21503 from AkihiroSuda/fix-Dockerfile-simple 
Update Dockerfile.simple so that it can be successfuly built
 2016-03-25 11:06:47 -07:00
David Calavera
4bd03fe71b Merge pull request #21517 from sdurrheimer/zsh-completion-load-quiet 
Add zsh completion for 'docker load -q --quiet'
 2016-03-25 11:06:13 -07:00
David Calavera
aa7be04e52 Merge pull request #21520 from albers/completion-labels-everywhere 
bash completion for labels on build, networks and volumes
 2016-03-25 11:05:45 -07:00
Harald Albers
a2958aa18f bash completion for labels on build, networks and volumes 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-25 10:56:04 -07:00
Tõnis Tiigi
e2221d1f37 Merge pull request #21468 from coolljt0725/remove_useless_log 
Do not return error on hijacked connection for docker exec
 2016-03-25 10:50:43 -07:00
Tõnis Tiigi
fc3d87f80f Merge pull request #21474 from jfrazelle/fastness-for-the-storage-driver-gods 
set the default storage driver as the users current default
 2016-03-25 10:47:40 -07:00
Brian Goff
2c224fb06a Merge pull request #21509 from kencochrane/add_better_unsupported_message 
Added a better message for when we build an unsupported Docker version
 2016-03-25 13:46:41 -04:00
Steve Durrheimer
f8009d10bb Add zsh completion for 'docker load -q --quiet' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 18:36:45 +01:00
Arnaud Porterie
ed95d753b4 Merge pull request #21511 from tiborvass/fix-release-scripts 
Fix release scripts
 2016-03-25 10:34:09 -07:00
Arnaud Porterie
e262817682 Merge pull request #21514 from tonistiigi/disable-privileged-test-in-userns 
Disable privileged test in user namespace
 2016-03-25 10:30:12 -07:00
Brian Goff
7307998a44 Merge pull request #21399 from LK4D4/fix_builder_race 
builder: replace cancelled channel with net/context
 2016-03-25 13:09:23 -04:00
Arnaud Porterie
f7cd8b2da0 Merge pull request #21515 from albers/completion-logopt-fluentd 
bash completion for new fluentd log driver options
 2016-03-25 09:56:53 -07:00
Tonis Tiigi
f01e1c865f Disable privileged test from in user namespace 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-25 09:31:36 -07:00
Alexander Morozov
d7b341bc06 Merge pull request #21477 from cpuguy83/better_logging_on_integration 
Better logging for errors in some tests
 2016-03-25 09:16:18 -07:00
Tibor Vass
996138bf8e Fix release scripts 
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
  hack/make/generate-index-listing

We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.

This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-25 11:55:26 -04:00
Alexander Morozov
f2401a0f69 builder: replace cancelled channel with net/context 
Also stop execution of run immediately if request was cancelled.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 08:19:29 -07:00
Ken Cochrane
181d2725d7 Added a better message for when we build an unsupported version 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-03-25 10:09:03 -04:00
Brian Goff
42df9edc4a Better logging for errors in some tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-25 10:02:52 -04:00
Brian Goff
e80f8364bf Merge pull request #21432 from vikstrous/fix_volume_store_race2 
fix race condition between list and remove volume
 2016-03-25 09:47:49 -04:00
Harald Albers
06e357da35 bash completion for new fluentd log driver options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-25 03:31:48 -07:00
Vincent Demeester
9fbe1d9917 Merge pull request #21465 from runcom/fix-test 
integration-cli: fix wrong test and add log
 2016-03-25 10:22:01 +01:00
Sebastiaan van Stijn
36458b5787 Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks 
Fix symlink copying for deb init scripts
 2016-03-25 01:08:09 -07:00
Akihiro Suda
4bf770a4c6 Update Dockerfile.simple so that it can be successfuly built 
* build-essential is needed by `make`
 * libapparmor-dev is needed by runc
 * seccomp is needed by runc
 * Go is neeeded by runc

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-03-25 16:59:07 +09:00
Vincent Demeester
2de29fb9c2 Merge pull request #21361 from HackToday/addfilter 
Add name/driver filter support for volume
 2016-03-25 08:07:38 +01:00
Tonis Tiigi
61277c395b Fix symlink copying for deb init scripts 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 23:15:17 -07:00
Alexander Morozov
d5019972e5 Merge pull request #21499 from cyli/hardware-signing-experimental-again 
Move hardware signing back to experimental again
 2016-03-24 23:03:13 -07:00
Sebastiaan van Stijn
f3d824771a Merge pull request #21487 from tonistiigi/fix-old-dind 
Fix setting cgroup permission to user/privileged devices
 2016-03-24 22:56:39 -07:00
Arnaud Porterie
b35aaa9d1e Merge pull request #21489 from calavera/downgrade_go 
Downgrade to Go 1.5.3.
 2016-03-24 22:44:49 -07:00
Alexander Morozov
641bd7652f Merge pull request #20589 from coolljt0725/fix_restore_terminal 
cli: move setRawTerminal and restoreTerminal to holdHijackedConnection
 2016-03-24 22:42:24 -07:00
cyli
dd33d18045 Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga" 
This reverts commit e6d3a9849c, reversing
changes made to d3afe34b51.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-03-24 21:12:52 -07:00
Sebastiaan van Stijn
de4cc7cd13 Merge pull request #21484 from albers/docs-load--quiet 
add docs for `docker load --quiet`
 2016-03-24 18:59:53 -07:00
Tibor Vass
9ff767bcc0 Merge pull request #21492 from mavenugo/civ6 
Add "--ipv6" flag in IT for network create when using ipv6 subnets
 2016-03-24 21:26:08 -04:00
Lei Jitang
66d3dcc6f7 cli: move setRawTerminal and restoreTerminal to holdHijackedConnection 
In this way, we can restore the Terminal as soon as possible once the hijacked
connection end. This not only fix weird output if cli enable -D, but also
remove duplicate code.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 21:25:50 -04:00
Kai Qiang Wu(Kennan)
8e9305ef94 Add name/driver filter support for volume 
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.

Closes: #21243

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-03-25 01:11:17 +00:00
Madhu Venugopal
ec77c124de Add "--ipv6" flag in IT for network create when using ipv6 subnets 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-03-24 16:19:59 -07:00
David Calavera
3e0bd74a3d Downgrade to Go 1.5.3. 
To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-24 19:15:10 -04:00
John Howard
c162cdb15f Windows: Native console disableNewlineAutoReturn 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-24 15:37:47 -07:00
Alexander Morozov
6748ecb005 Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version 
Remove unnecessary hardcoded version.
 2016-03-24 14:31:59 -07:00
Tibor Vass
ed25df9a07 Merge pull request #21387 from kencochrane/change_packages 
Packaging changes required for new containerd binaries
 2016-03-24 17:29:55 -04:00
Tonis Tiigi
8784bd6fde Fix wrong variable name on blkio resources 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:40 -07:00
Tonis Tiigi
ee61235880 Fix setting cgroup permission to user/privileged devices 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-24 14:16:33 -07:00
Sebastiaan van Stijn
f2847f8ab3 Merge pull request #21315 from hqhq/hq_check_quota 
Add validation for cpu period and quota
 2016-03-24 14:10:48 -07:00
Sebastiaan van Stijn
1e8d1b5faa Merge pull request #21463 from yongtang/21445-too-long-hostname 
More descriptive error when running a container with a too long hostname (#21445)
 2016-03-24 13:42:28 -07:00
David Calavera
9558d249e9 Merge pull request #21478 from albers/ignore-bashrc 
re-add .bashrc to .gitignore
 2016-03-24 13:29:46 -07:00
Ken Cochrane
bb66d7144f Packaging changes required for new containerd binaries 
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-03-24 16:25:33 -04:00
John Howard
77a50ffa59 Windows: Remove --exec-root 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-24 11:42:03 -07:00