Commit Graph

9832 Commits

Author SHA1 Message Date
Tianon Gravi a6f1995550 Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
Note that the archive does _not_ have a symlink from oldstable-lts to squeeze-lts, hence the change from using "${suite}" to not using it in here and just using the string "squeeze-lts" directly regardless of whether we're building a "squeeze" image or an "oldstable" image.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 17:14:31 -06:00
Victor Vieux 714b63d1be Add repo/tag parsing on the daemon for pull and import
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-07 23:09:42 +00:00
Roberto Gandolfo Hashioka fd66e77465 Update the footer version with Enterprise and Partners sections
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-07-07 16:02:15 -07:00
Tianon Gravi 77ed01c8da Merge pull request #6886 from tianon/no-binddir-if-docker_host
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
2014-07-07 17:00:03 -06:00
Victor Vieux 170609e369 Merge pull request #6720 from fabiofalci/relax_dns_search
Relax dns search to accept empty domain
2014-07-07 15:12:29 -07:00
Tibor Vass 52c58b9ea0 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
docker save: fix the 'repositories' file
2014-07-07 17:26:52 -04:00
Michael Crosby f34510b123 Merge pull request #6813 from gsalgado/convert-testgetimagesjson
Convert TestGetImagesJSON into several unit tests
2014-07-07 13:40:38 -07:00
unclejack e7db0d4f44 Merge pull request #6829 from unclejack/update_archive_tar
update vendored archive/tar to lower the number of memory allocations
2014-07-07 23:35:19 +03:00
Guilherme Salgado 627805f5f8 Convert TestGetImagesJSON into several unit tests
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
2014-07-07 21:55:26 +02:00
Timothy Hobbs ea583fda97 We haven't required lxc and aufs for years now...
Well, maybe not years, but internet years...

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-07-07 19:45:36 +00:00
Michael Crosby 3993f9d581 Merge pull request #6799 from LK4D4/refactor_portallocator
Refactoring portallocator
2014-07-07 12:39:36 -07:00
Michael Crosby bade039bda Merge pull request #6821 from LK4D4/broadcast_writer_refactor
Broadcast writer refactor
2014-07-07 12:15:47 -07:00
Vincent Batts 600f65b247 docker save: more integration tests
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-07-07 14:58:27 -04:00
Victor Vieux 578513095c Merge pull request #6850 from leeplay/patch-2
Update README.md
2014-07-07 11:50:27 -07:00
Michael Crosby 35b511b6d0 Merge pull request #6702 from mrunalp/dev/helper_fns
Move setting hostConfig and pulling images into helper functions.
2014-07-07 11:39:27 -07:00
Michael Crosby 219a3345de Merge pull request #6452 from mheon/selinux_btrfs_fix
Error if Docker daemon starts with BTRFS graph driver and SELinux enabled
2014-07-07 11:34:50 -07:00
unclejack 2e4f99d99c Merge pull request #6645 from snitm/dmthinp-devel
Dmthinp devel
2014-07-07 21:20:31 +03:00
Victor Vieux 880c98d2d3 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli
Moved last build tests to integration-cli
2014-07-07 10:53:26 -07:00
Michael Crosby 860c664ccb Merge pull request #6508 from mheon/signals
Increase size of buffer for signal forwarding with --sig-proxy
2014-07-07 10:45:31 -07:00
Michael Crosby bcec0f30e8 Merge pull request #6371 from jpetazzo/6370-masquerade
Select masquerade by outgoing interface rather than by destination subne...
2014-07-07 10:28:31 -07:00
Victor Vieux dd89904ad3 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version
add client OS and arch to docker version
2014-07-07 10:15:30 -07:00
Victor Vieux 4a20c9b005 Merge pull request #6823 from folieadrien/move_integration_tests
Convert TestGetImagesByName into unit and integration-cli test
2014-07-07 10:13:19 -07:00
Tianon Gravi c2653b0a9e Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 10:54:03 -06:00
Tianon Gravi 9f61e233c6 Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 10:35:38 -06:00
Tianon Gravi de07654c60 Merge pull request #6884 from tianon/use-docker-based-travis
Update Travis to use pretty Docker-based workers
2014-07-07 10:09:31 -06:00
Tianon Gravi 3e2ad6ffee 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)
2014-07-07 10:04:23 -06:00
Tianon Gravi 09927fdbae Merge pull request #6883 from tianon/fix-dco-parsing-for-numeric
Fix DCO parsing for numeric github handles like cpuguy83
2014-07-07 10:02:02 -06:00
Tianon Gravi bbbf642427 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)
2014-07-07 09:57:50 -06:00
unclejack e2c575c5a6 Merge pull request #6756 from kzys/lxc-linux
Skip lxc_template_unit_test.go on non-Linux platforms
2014-07-07 18:46:46 +03:00
Tianon Gravi cafb1bfd76 Merge pull request #6878 from tianon/update-travis-github-username-regex
Update the Travis GitHub username regex to match the GitHub username requirements
2014-07-07 09:26:32 -06:00
unclejack 2ffd13bc31 Merge pull request #6573 from mheon/ps_cleanup
Escape control and nonprintable characters in docker ps
2014-07-07 18:23:18 +03:00
Tianon Gravi 07be572f8e Merge pull request #6873 from tianon/6836-fix-systemd-socket-perms
Fix the systemd socket activation socket permissions
2014-07-07 08:56:04 -06:00
Tianon Gravi e895817ad7 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)
2014-07-07 08:36:31 -06:00
Tianon Gravi 3589f5b9c2 Fix the systemd socket activation socket permissions
Fixes #6836

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 08:09:25 -06:00
Chewey 963ee6ce79 Update running_riak_service.md 2014-07-07 17:52:18 +04:00
Andrea Turli 2f13d3a8e5 add jclouds-docker client reference
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)

Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: )
2014-07-07 15:14:41 +02:00
Tom Fotherby ebbfdf0a0f Reformat to keep line length within 80 characters
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-07 12:01:04 +01:00
Sven Dowideit 323e6a3cf2 Merge pull request #6840 from gesellix/patch-1
docs: add Groovy Docker-Client link
2014-07-07 11:16:55 +10:00
Sven Dowideit cf01997ebe Merge pull request #6846 from irbull/master
Fix the parent/child relationship in the docs
2014-07-07 10:27:27 +10:00
Sven Dowideit 2f649301e5 Merge pull request #6860 from felixrabe/patch-7
run.md: Fix references to cli
2014-07-07 09:37:42 +10:00
Felix Rabe 95870ef334 run.md: Fix references to cli
There are now no other occurrences of `#cli-` in this document.

TODO: Find other places with wrong links.
2014-07-06 14:47:37 +02:00
LK4D4 1d4862b7a2 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)
2014-07-06 15:36:34 +04:00
Ian Bull 29a20672c2 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)
2014-07-05 13:58:09 -07:00
Vincent Batts ac392bc0d7 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)
2014-07-05 16:52:23 -04:00
Tom Fotherby 87df57810d Update File mount info for docker v1.1.0
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-05 03:46:41 +01:00
Tom Fotherby cfbe062eb2 Add info to Mount a Host File as a Data Volume
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-04 18:52:10 +01:00
OddBloke 20a77aeeb8 Explain ADD invalidation more accurately
And also move it in to the `ADD` section, rather than being hidden in the `RUN` section.

Docker-DCO-1.1-Signed-off-by: Daniel Watkins <daniel@daniel-watkins.co.uk> (github: OddBloke)
2014-07-04 16:40:23 +01:00
Tianon Gravi 02ef9437d3 Merge pull request #6852 from Odaeus/patch-1
Fix "Error while reading file" in Fish completion
2014-07-04 08:11:12 -06:00
Andrew France 6ad5fe8659 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)
2014-07-04 15:07:49 +01:00
Sven Dowideit eceacb8334 add client OS and arch to docker version
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-04 21:23:36 +10:00