docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
901 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

901 Commits

Author SHA1 Message Date
Andrea Luzzardi 83c67a9059 Merge pull request #353 from vieux/gitcommit 
add gitcommit to version
 2015-02-02 17:59:41 -08:00
Victor Vieux e38b06fbe8 add VERSION file 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 01:53:01 +00:00
Andrea Luzzardi 860a3d5f6b Merge pull request #350 from vieux/add_missing_close_proxy 
add missing close in proxy
 2015-02-02 17:16:17 -08:00
Victor Vieux 7c504dc58b add gitcommit to version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 01:15:00 +00:00
Andrea Luzzardi 39f12e3a5a Merge pull request #352 from vieux/add_docker_compose_files 
add some docker-compose.yml
 2015-02-02 16:52:31 -08:00
Victor Vieux c0f97419c9 add some docker-compose.yml 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-03 00:37:35 +00:00
Victor Vieux c966030832 add missing close in proxy 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 22:49:05 +00:00
Andrea Luzzardi 4cac8f2682 Merge pull request #348 from vieux/update_requirements 
update swarm manage requirements
 2015-02-02 13:35:18 -08:00
Andrea Luzzardi a9641bcfe9 Merge pull request #340 from vieux/go_vet 
hack code to not error on go vet
 2015-02-02 13:15:09 -08:00
Victor Vieux aaac7cbb94 update swarm manage requirements 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 18:34:24 +00:00
Victor Vieux 34fdc81c2e hack code to not error on go vet 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-02 18:20:41 +00:00
Victor Vieux bcc9f8b7c6 Merge pull request #343 from mota/fix-token-leak 
Force connection close with token discovery
 2015-02-02 10:18:31 -08:00
Victor Vieux 1cd422aa26 Merge pull request #345 from aluzzardi/demo-scripts 
Move contrib files into script/demo.
 2015-02-02 09:56:27 -08:00
Victor Vieux 5699ad5a15 Merge pull request #344 from aluzzardi/dockerfile-gopath-fix 
Dockerfile: Prioritize godep's workspace over GOPATH.
 2015-02-02 09:56:11 -08:00
Victor Vieux 933a1e82fb Merge pull request #254 from SvenDowideit/add-mkdocs-metadata-and-reflow-to-80-chars 
Work on userguide and get the docs ready to be consumed by the docker docs-release
 2015-02-02 09:55:42 -08:00
Andrea Luzzardi d43ad7eb9e Move contrib files into script/demo. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-01 18:41:20 -08:00
Andrea Luzzardi 6c3444a9a1 Dockerfile: Prioritize godep's workspace over GOPATH. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-01 18:39:06 -08:00
Sven Dowideit 061592d237 Started working through document 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:45 +10:00
Sven Dowideit 34373bdf5a start userguide from the README.md 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:45 +10:00
Sven Dowideit 14c4fb81cf Add docker.docker.com metadata and reflow to 80-chars for GH diffs 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-02 09:53:43 +10:00
Pierre Wacrenier e3bf42d5be Force connection close with token discovery 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2015-02-01 05:48:30 +01:00
Victor Vieux 85fa8d4291 Merge pull request #339 from aluzzardi/dockerfile 
Dockerfile improvements.
 2015-01-30 17:45:36 -08:00
Andrea Luzzardi 3da0aaf753 Dockerfile: Expose the swarm storage directory as a volume. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-30 17:42:48 -08:00
Andrea Luzzardi a2203a92a5 Dockerfile: Statically compile the swarm binary. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-30 17:41:53 -08:00
Victor Vieux b5cef2f19f Merge pull request #329 from aluzzardi/travis-test 
Simplify travis configuration.
 2015-01-30 17:24:19 -08:00
Victor Vieux 682633a7ef Merge pull request #330 from psftw/tweaks 
Tweak Dockerfile for official image.
 2015-01-30 17:19:07 -08:00
Peter Salvatore c88039f619 Tweak Dockerfile for official image. 
Replaced ADD with COPY per best practices article.  Removed unnecessary
Godeps install, and added a .dockerignore to shave off ~23M.

Signed-off-by: Peter Salvatore <peter@psftw.com>
 2015-01-30 19:58:14 -05:00
Andrea Luzzardi 405494df65 Merge pull request #338 from vieux/error_empty_token 
error when token is empty
 2015-01-30 15:18:54 -08:00
Victor Vieux 29bfee02fe error when token is empty 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-30 22:42:18 +00:00
Andrea Luzzardi ead7c278bd Simplify travis file. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 19:04:25 -08:00
Victor Vieux 78d86ac38a Merge pull request #327 from aluzzardi/vieux-fix_match 
Fix affinity matching.
 2015-01-28 15:50:46 -08:00
Andrea Luzzardi 51e89bc928 constraint filter: Simplify code. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 15:35:40 -08:00
Victor Vieux e9130cac52 Merge pull request #320 from aluzzardi/godep-dockerfile 
Dockerfile: Build swarm with vendored dependencies.
 2015-01-28 15:11:08 -08:00
Victor Vieux 30a5f64893 Merge pull request #328 from aluzzardi/fix-panic-eventhandler 
Fix a panic that occurs in the log handler when pulling images.
 2015-01-28 14:54:59 -08:00
Andrea Luzzardi 269cbb0cf4 exec bit on shell files. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 13:26:34 -08:00
Andrea Luzzardi acd036365d Fix a panic that occurs in the log handler when pulling images. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:29:41 -08:00
Andrea Luzzardi df4ffb5a7b affinity: Ensure affinities can be chained. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:16:23 -08:00
Andrea Luzzardi 04fc1ab997 expr: Get rid of MatchEmpty. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:12:09 -08:00
Andrea Luzzardi fc192b7077 affinity: Fix expression matching by passing arguments in bulk. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:07:20 -08:00
Andrea Luzzardi 5627b390df filter expr: Test that the order in Match doesn't matter. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-28 12:07:20 -08:00
Victor Vieux 2f1a9b21b6 fix match 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-28 12:07:20 -08:00
Andrea Luzzardi de67d96532 Dockerfile: Build swarm with vendored dependencies. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-27 18:32:07 -08:00
Victor Vieux 86a028d7c1 Merge pull request #317 from aluzzardi/godep 
Vendoring dependencies with godep.
 2015-01-27 18:08:34 -08:00
Andrea Luzzardi bacf1ee849 Vendoring: Freeze dependencies. 
Generated by: godep save ./...

Fixes #264

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-27 18:06:15 -08:00
Andrea Luzzardi ae3b1cfac9 travis: Restore dependencies using godep. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-27 18:06:13 -08:00
Andrea Luzzardi 23302fca3e travis: Exclude Godeps from gofmt validation. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-27 17:16:46 -08:00
Victor Vieux 45c1efd2c5 Merge pull request #318 from vieux/fix_status_code 
add missing status codes
 2015-01-27 14:37:09 -08:00
Victor Vieux ad8f7facf7 add missing status codes 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-01-27 14:28:54 -08:00
Victor Vieux 0c446154d4 Merge pull request #315 from aluzzardi/redmon-demo-affinity 
Add affinity to the redmon demo.
 2015-01-27 12:38:14 -08:00
Andrea Luzzardi 3d4a2f4ff4 Add affinity to the redmon demo. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-01-27 12:37:44 -08:00