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

9304 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Victor Vieux
44d737707c Merge pull request #6771 from LK4D4/fix_containers_list_race 
Add synchronization in server.Containers
 2014-07-03 17:53:50 -07:00
Tibor Vass
0cdda85df2 Merge pull request #6801 from cpuguy83/remove_dup_run_tests 
Remove dup tests
 2014-07-03 18:30:58 -04:00
Brian Goff
0a3abe33f0 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)
 2014-07-03 17:35:03 -04:00
Fred Lifton
8f97a1778e Merge pull request #6842 from mrorii/patch-1 
doc fix: remove trailing *
 2014-07-03 14:30:41 -07:00
Naoki Orii
6e4b37fffd doc fix: remove trailing * 
The trailing `*` makes it seem like there is some kind of annotation
 2014-07-03 14:02:40 -07:00
Victor Vieux
700880ca16 Merge pull request #6838 from vieux/merge_release_v1.1.0 
Merge release v1.1.0
 2014-07-03 11:04:26 -07:00
Victor Vieux
d55cafb72e Change version to 1.1.0-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-03 18:01:36 +00:00
Victor Vieux
b3191bf042 Merge remote-tracking branch 'origin/release' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-03 18:01:13 +00:00
Victor Vieux
4c52272a2d Merge pull request #6818 from vieux/bump_v1.1.0 
Bump v1.1.0
 2014-07-03 10:57:44 -07:00
James Turnbull
e11a714f7a Merge pull request #6827 from SvenDowideit/docker-com-theme-regressions 
Fix 2 docker.com theme regressions on docs.docker.com
 2014-07-03 07:30:18 -04:00
Sven Dowideit
873241790f 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)
 2014-07-02 21:19:48 -07:00
Victor Vieux
79812e3646 Bump version to v1.1.0 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-03 01:15:11 +00:00
Sven Dowideit
6eda9f3207 Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess 
missed these merge conflicts when manually rebasing too many files
 2014-07-03 11:12:13 +10:00
SvenDowideit
f8d9ecfb2c missed these merge conflicts when manually rebasing too many files 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 11:07:42 +10:00
Sven Dowideit
9fe95f1c5b Merge pull request #6824 from fredlf/1-1_release_notes 
Added Release Notes
 2014-07-03 10:45:11 +10:00
Fred Lifton
c3f4972f6d Corrected version number to 3 digits. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-02 17:41:52 -07:00
Sven Dowideit
65e4b57fda Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit 
update release checklist and .gitignore
 2014-07-03 10:36:52 +10:00
Fred Lifton
f746a48fe6 Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.com 
some docker.io -. docker.com conversions
 2014-07-02 17:34:31 -07:00
SvenDowideit
fa29b1f062 I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:31:56 +10:00
Fred Lifton
2c32c195d9 Merge pull request #6790 from SvenDowideit/pr_out_update_cli_md 
update cli.md
 2014-07-02 17:24:53 -07:00
SvenDowideit
b07f193822 Update cli.md and man pages to match current cli 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:22:20 +10:00
James Turnbull
b59754bcb3 Fixed numerous inconsistencies in command help text 
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: SvenDowideit)
 2014-07-03 10:22:09 +10:00
Fred Lifton
d946cae364 Added Release Notes 
Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to
other content to make it shorter.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-02 16:33:13 -07:00
Victor Vieux
170ba7f8fe update release checklist and .gitignore 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-02 18:54:14 +00:00
Victor Vieux
8ea3589287 Merge pull request #6808 from vieux/pr_6806 
Add backwards READ compatibility for the old libcontainer API
 2014-07-02 10:51:27 -07:00
Tibor Vass
f357b18ee3 Merge pull request #6780 from unclejack/tweak_cli_integration_tests 
Tweak cli integration tests
 2014-07-02 13:16:26 -04:00
unclejack
deb57c5144 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
 2014-07-02 19:44:21 +03:00
Tianon Gravi
292483531f Merge pull request #6814 from tianon/more-init-ulimit 
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
 2014-07-02 10:08:11 -06:00
unclejack
dad4768037 integcli: add & use pullImageIfNotExist for pulls 
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-02 18:45:11 +03:00
Tianon Gravi
bae79c3e72 Add NOFILE and NPROC ulimit settings to the SysV init script 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-02 09:38:19 -06:00
Tianon Gravi
7abe70c0b1 Add NOFILE and NPROC ulimit settings to the OpenRC init script 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-02 09:36:57 -06:00
Victor Vieux
d403936818 fix compilation and panic 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-02 00:54:08 +00:00
Tibor Vass
cccb64e863 Add backwards READ compatibility for the old libcontainer API 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-02 00:19:05 +00:00
Fred Lifton
5ff18b8155 Merge pull request #6789 from SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms 
expand to 'used b2d vm on any of the platforms'
 2014-07-01 16:09:38 -07:00
Tibor Vass
b0824edc7c Merge pull request #6748 from LK4D4/increase_max_patricia_prefix 
Increase max patricia prefix
 2014-07-01 19:03:30 -04:00
Fred Lifton
96e2bfe28a Merge pull request #6781 from anweiss/6738-dscarticle 
Add Article for PowerShell DSC
 2014-07-01 15:48:19 -07:00
James Turnbull
a52d90a100 Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-world 
removing the exclaimation mark from our hello-world examples, some users...
 2014-07-01 18:10:17 -04:00
Sven Dowideit
a09f99b8b0 Lowercase world, because its not important. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-07-01 15:07:48 -07:00
SvenDowideit
3091d9a31e removing the exclaimation mark from our hello-world examples, some users get trapped by the shell 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-01 15:07:48 -07:00
Sven Dowideit
91c4fbb7bf convert OSX into OS X 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-07-01 15:00:34 -07:00
SvenDowideit
84990731f7 expand to 'used b2d vm on any of the platforms' 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-01 15:00:34 -07:00
Tom Maaswinkel
fc4c0d9de4 Update usingdocker.md 
boot2docker on windows also uses an IP of its own.

Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu> (github: SvenDowideit)
 2014-07-01 15:00:34 -07:00
Victor Vieux
49d49ac98f Merge pull request #6803 from vieux/pr_6176 
Implement tail for docker logs
 2014-07-01 14:59:37 -07:00
Victor Vieux
e06d533cc2 update docs 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-01 21:59:08 +00:00
Andrew Weiss
5c344dca4b add DSC article 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
 2014-07-01 17:32:55 -04:00
Tibor Vass
1822bf730e Merge pull request #6798 from tiborvass/docs-dockerignore 
More docs for dockerignore
 2014-07-01 17:23:00 -04:00