Commit Graph

8604 Commits

Author SHA1 Message Date
5a05ec9b94 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
docker save: fix the 'repositories' file
Upstream-commit: 52c58b9ea09655fdcd143f94d733a91229dd557c
Component: engine
2014-07-07 17:26:52 -04:00
a4bc6c02a7 Merge pull request #6813 from gsalgado/convert-testgetimagesjson
Convert TestGetImagesJSON into several unit tests
Upstream-commit: f34510b1235bbe7f785e4cead7bfc97f4041bb6f
Component: engine
2014-07-07 13:40:38 -07:00
9f5fa2a3c1 Merge pull request #6829 from unclejack/update_archive_tar
update vendored archive/tar to lower the number of memory allocations
Upstream-commit: e7db0d4f44b3a4cd9b34776bc936f42fa417f9ea
Component: engine
2014-07-07 23:35:19 +03:00
f220709916 Convert TestGetImagesJSON into several unit tests
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: 627805f5f8895c3a3887c312f7b8f49a89e51732
Component: engine
2014-07-07 21:55:26 +02:00
ea789048c6 Merge pull request #6799 from LK4D4/refactor_portallocator
Refactoring portallocator
Upstream-commit: 3993f9d5818f344199c3b13ae8aa9e6bee22479e
Component: engine
2014-07-07 12:39:36 -07:00
6996bb64aa Merge pull request #6821 from LK4D4/broadcast_writer_refactor
Broadcast writer refactor
Upstream-commit: bade039bda0ddff19b14db516ecb210f343243a2
Component: engine
2014-07-07 12:15:47 -07:00
b15cf92d6a docker save: more integration tests
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 600f65b24786d15a382877da4c3ae77d88e252bb
Component: engine
2014-07-07 14:58:27 -04:00
1270978241 Merge pull request #6850 from leeplay/patch-2
Update README.md
Upstream-commit: 578513095c1f69227d7942d167fc41b6598d95ac
Component: engine
2014-07-07 11:50:27 -07:00
df92ffe131 Merge pull request #6702 from mrunalp/dev/helper_fns
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
2014-07-07 11:39:27 -07:00
bdbe2e1a2a Merge pull request #6452 from mheon/selinux_btrfs_fix
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
Upstream-commit: 219a3345deade869a415436c2b5c24c0c523ca08
Component: engine
2014-07-07 11:34:50 -07:00
efbfc9bcff Merge pull request #6645 from snitm/dmthinp-devel
Dmthinp devel
Upstream-commit: 2e4f99d99c34edaba2d37270545af2b8fd753dab
Component: engine
2014-07-07 21:20:31 +03:00
5a10cf09e4 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
Moved last build tests to integration-cli
Upstream-commit: 880c98d2d3500a5b694eb4e3a610b6aedf1fa493
Component: engine
2014-07-07 10:53:26 -07:00
111401852c Merge pull request #6508 from mheon/signals
Increase size of buffer for signal forwarding with --sig-proxy
Upstream-commit: 860c664ccbe1fd680be3952034126d82ce73a064
Component: engine
2014-07-07 10:45:31 -07:00
6a68c558b1 Merge pull request #6371 from jpetazzo/6370-masquerade
Select masquerade by outgoing interface rather than by destination subne...
Upstream-commit: bcec0f30e8d7dbb9fcdd6a85fa4b8e4953ba66ff
Component: engine
2014-07-07 10:28:31 -07:00
35129fcf06 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
add client OS and arch to docker version
Upstream-commit: dd89904ad3ad8147fb046db0e5fef9f6379f9a39
Component: engine
2014-07-07 10:15:30 -07:00
d1bf2949a1 Merge pull request #6823 from folieadrien/move_integration_tests
Convert TestGetImagesByName into unit and integration-cli test
Upstream-commit: 4a20c9b005362ffdaa6b1b71adab1063191cf9f5
Component: engine
2014-07-07 10:13:19 -07:00
7655d4fdd1 Merge pull request #6884 from tianon/use-docker-based-travis
Update Travis to use pretty Docker-based workers
Upstream-commit: de07654c60d74efac10f14ff01039dd757a7dbd8
Component: engine
2014-07-07 10:09:31 -06:00
2f832eb657 Update Travis to use pretty Docker-based workers
These start up much faster and the only caveat is that we can't use "sudo" (which we don't currently use anyhow).

Also, I've updated the Go version here to match what's in the Dockerfile.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3e2ad6ffee68be7f3462fd1311408c7880cd8d88
Component: engine
2014-07-07 10:04:23 -06:00
03141b4b87 Fix DCO parsing for numeric github handles like cpuguy83
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bbbf64242726dee184f82b3bb355327c9c85b274
Component: engine
2014-07-07 09:57:50 -06:00
1485171732 Merge pull request #6756 from kzys/lxc-linux
Skip lxc_template_unit_test.go on non-Linux platforms
Upstream-commit: e2c575c5a618c51f08d457fc227276dcb340e0f0
Component: engine
2014-07-07 18:46:46 +03:00
a5e156407f Merge pull request #6878 from tianon/update-travis-github-username-regex
Update the Travis GitHub username regex to match the GitHub username requirements
Upstream-commit: cafb1bfd76b902437d06b713dc400b9076030ccb
Component: engine
2014-07-07 09:26:32 -06:00
4f072fe2fa Merge pull request #6573 from mheon/ps_cleanup
Escape control and nonprintable characters in docker ps
Upstream-commit: 2ffd13bc3159ef3a1f97d9a59cfe7704264c2db1
Component: engine
2014-07-07 18:23:18 +03:00
1107c3c89f Update the Travis GitHub username regex to match the GitHub username requirements
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e895817ad72c681b265bc647d18f201ceced90c5
Component: engine
2014-07-07 08:36:31 -06:00
9eda104cfe Fix the systemd socket activation socket permissions
Fixes #6836

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3589f5b9c2d9e5cb6d057713aa8d591295c5f523
Component: engine
2014-07-07 08:09:25 -06:00
58385e59a1 Merge pull request #6840 from gesellix/patch-1
docs: add Groovy Docker-Client link
Upstream-commit: 323e6a3cf29677459a7bc658a0b5221e5675bc46
Component: engine
2014-07-07 11:16:55 +10:00
1f0f85afed Merge pull request #6846 from irbull/master
Fix the parent/child relationship in the docs
Upstream-commit: cf01997ebeea84b31c35bb99253e5f3ca5b05533
Component: engine
2014-07-07 10:27:27 +10:00
0664d3e7f1 run.md: Fix references to cli
There are now no other occurrences of `#cli-` in this document.

TODO: Find other places with wrong links.
Upstream-commit: 95870ef3349920efc981a703d52f5832b79ee18e
Component: engine
2014-07-06 14:47:37 +02:00
3c88fb5533 Moved last build tests to integration-cli
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
2014-07-06 15:36:34 +04:00
8ad8344e9f Fix the parent/child relationship in the docs
In the Docker Linking Docs, the parent child relationship
was backwards. The Web container should be able to access
the DB, not other way around. Furthermore, the output of
'docker ps' was wrong (it showed that the DB could access
the Web). This fixes both typos.

Docker-DCO-1.1-Signed-off-by: Ian Bull <irbull@gmail.com> (github: irbull)
Upstream-commit: 29a20672c216e2f8aa90af765ac5c47e3350b3d9
Component: engine
2014-07-05 13:58:09 -07:00
0fa89bda57 docker save: fix the 'repositories' file
For various use cases, the 'repositories' file does not match expected
behavior.

Like,

	docker save busybox:latest | tar t

Before:

	[...]
	busybox:latest/
	busybox:latest/VERSION
	busybox:latest/json
	busybox:latest/layer.tar
	# note, the layer name, and lack of 'repositories' file

Now:

	[...]
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
	repositories
	# and the repositories file is correct for the single tagged
	# image.
	#> {"busybox":{"latest":"a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721"}}

and

	docker save a9eb17255234 | tar t

Before:
	[...]
	a9eb17255234/
	a9eb17255234/VERSION
	a9eb17255234/json
	a9eb17255234/layer.tar
	# Note the truncated layer name

Now:
	[...]
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
	# There is no 'repositories' file, because there is no named repo

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: ac392bc0d775455f71da3c71956f9f6ae7a87f6d
Component: engine
2014-07-05 16:52:23 -04:00
5f0247a4bd Fix "Error while reading file" Fish completion
An unbalanced single quote caused Fish to fail to load the completion file with `source: Error while reading file “/etc/fish/completions/docker.fish”`.

Docker-DCO-1.1-Signed-off-by: Andrew France <andrew@avito.co.uk> (github: Odaeus)
Upstream-commit: 6ad5fe86590f757eca754d5bb4a599faec63ae30
Component: engine
2014-07-04 15:07:49 +01:00
bb9d32707c add client OS and arch to docker version
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eceacb8334250b9f241b263f28372d5f35ada71d
Component: engine
2014-07-04 21:23:36 +10:00
7f05b13374 Update README.md
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 649b50c0b71a21f8ea6b88c63008a0f909fe4113
Component: engine
2014-07-04 18:21:13 +09:00
5488e10c5e Merge pull request #6771 from LK4D4/fix_containers_list_race
Add synchronization in server.Containers
Upstream-commit: 44d737707c513dd987933642680c36ef586b1b0e
Component: engine
2014-07-03 17:53:50 -07:00
6c8d9902d6 Merge pull request #6801 from cpuguy83/remove_dup_run_tests
Remove dup tests
Upstream-commit: 0cdda85df2a1aee0350fd344e6128eb2c2e4ef8a
Component: engine
2014-07-03 18:30:58 -04:00
0c1cce45f2 Remove dup tests
integration/server_test.go/TestCreateNumberUsername == integration-cli/docker_cli_run_test.go/TestUserByID
integration/server_test.go/TestRmi == integration-cli/docker_cli_images_test.go/TestCLIImageTagRemove

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0a3abe33f0bd9b7dfc36021b6f10d0857a432d40
Component: engine
2014-07-03 17:35:03 -04:00
f9a8a47305 doc fix: remove trailing *
The trailing `*` makes it seem like there is some kind of annotation
Upstream-commit: 6e4b37fffdfc324141aae9f86268db4e8ed7aeb0
Component: engine
2014-07-03 14:02:40 -07:00
984e0d89c3 docs: add Groovy Docker-Client link
Docker-DCO-1.1-Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> (github: gesellix)
Upstream-commit: 5c246c931eec7ec31a90fc4ae1577eb54f938427
Component: engine
2014-07-03 22:24:24 +02:00
a796dc81bf Change version to 1.1.0-dev
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: d55cafb72e25e5ef9b400c1c010e9832ec8b5561
Component: engine
2014-07-03 18:01:36 +00:00
d70b3f49e3 Merge remote-tracking branch 'origin/release'
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3191bf042d704a1e1d4aaeacd3e2bf257685558
Component: engine
2014-07-03 18:01:13 +00:00
9b1af46554 Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
The Docker btrfs graph driver does not interact well with SELinux at present.
If btrfs mounts the same file in several locations, the same SELinux label will
be applied to all mountpoints. In the context of the graph driver, things such
as shared libraries become inaccessible to containers due to SELInux, causing
all dynamically linked applications to fail when run in a container.

Consequently, error when we detect the daemon is being run with SELinux enabled
and the btrfs driver. Documentation has been added for this behavior.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 4318802f645cdd4fa63a894160f153a69a97af59
Component: engine
2014-07-03 08:11:18 -04:00
31988404b5 BroadcastWriter refactoring
It became slightly faster and lighter
possibly fixes #5923 problems

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7bdd23bfeec1968a3061e63e24af049837baf4c4
Component: engine
2014-07-03 10:12:53 +04:00
eec6ca2f45 Benchmark for BroadcastWriter
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: a8d95b7c573dedad26395372dd0d4ff8882f6cb6
Component: engine
2014-07-03 10:06:58 +04:00
ee3e18ed8e update vendored archive/tar to lower allocations
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b885f61a61df1e8d8f71914e17c2a2861167f96e
Component: engine
2014-07-03 08:28:39 +03:00
6e61659fda Fix 2 docker.com theme regressions on docs.docker.com
- Hover colours of doc nav wrong
- Primary Docs Nav not active when user is Logged in.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 873241790f802351d36c490046435215b33e4551
Component: engine
2014-07-02 21:19:48 -07:00
2d54d0cea4 Bump version to v1.1.0
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 79812e36468c6e9be19b7c028e37787d5ae6288b
Component: engine
2014-07-03 01:15:11 +00:00
a07084dd27 missed these merge conflicts when manually rebasing too many files
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f8d9ecfb2ceda0cc2aed3d8fd3fbcbf625a8fcdd
Component: engine
2014-07-03 11:07:42 +10:00
3309d6e15c Merge pull request #6824 from fredlf/1-1_release_notes
Added Release Notes
Upstream-commit: 9fe95f1c5bae60bad72f056b109e4b1b694d7dc0
Component: engine
2014-07-03 10:45:11 +10:00
478a3a5c9d Corrected version number to 3 digits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: c3f4972f6d036520df589676c7ebeef397d327c2
Component: engine
2014-07-02 17:41:52 -07:00
28b9680123 Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit
update release checklist and .gitignore
Upstream-commit: 65e4b57fda5b43ba2c1aa6db922b193b9b809600
Component: engine
2014-07-03 10:36:52 +10:00