02bad2214b
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
Upstream-commit: a2ec8fa1db6e2e77d29f58623f35c2b2ded8e3b7
Component: engine
2014-06-04 01:07:48 +03:00
ddc2df6d84
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
2014-06-04 06:54:19 +10:00
6fe0f07752
Changed all references from Trusted Builds to Automated Builds
...
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 9fc8028c987ac560ceb3b29eb609d77a82abdacc
Component: engine
2014-06-03 12:55:30 -07:00
0c475a0cf3
filters: don't encode empty set. API docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 02255ddaa4948fd94450fd5d9d2ee9b147e88352
Component: engine
2014-06-03 12:19:26 -04:00
e355fe478a
filters: change untagged to dangling
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3ecfaa8f2da60bb4e6ce6c9ae0428bc7b647e34b
Component: engine
2014-06-02 16:33:52 -04:00
f418e0d639
images: fix markdown documentation
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3391aac2b27ac95f58a20a2eb4046ad1f00b8be6
Component: engine
2014-06-02 16:33:51 -04:00
9a7aaea6bb
images filter: remove the redundant inverted filter
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cb7857de5d2595632b76e4e17acede85a519001a
Component: engine
2014-06-02 16:33:51 -04:00
bf13fd92ad
filters, for images: docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 55d95185edd4a646cd2a05b9397be6b8667d60d0
Component: engine
2014-06-02 16:33:51 -04:00
f90ca07ea9
filters, for images: start with untagged/tagged boolean
...
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
example like: docker rmi $(docker images -q --filter 'untagged=true')
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5f3812ec97f9a951bceb482fdcd355b6cbc1b113
Component: engine
2014-06-02 16:33:50 -04:00
6b5620e888
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
Upstream-commit: afb2d5de3de56ff54e1a25f402e369b5f4eb45d0
Component: engine
2014-06-02 12:28:57 -07:00
77921a7a55
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
Upstream-commit: 3e13aaec000aeaa16718e2408b0c371e4de69137
Component: engine
2014-06-02 12:03:11 -07:00
7eeb43108c
aws json is not javascript style json. trailing comma breaks it :(
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cac24bbfaf59570863a75e34a21b70ce1cc5c51f
Component: engine
2014-06-03 04:30:32 +10:00
071672b2fe
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com > (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4ac216d8d3441b8546798711320cb5679d33984d
Component: engine
2014-06-03 03:41:53 +10:00
1b1746cd69
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
e0357c5a9f
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
Upstream-commit: 4edcbfdeb7d056f47f2eba13c6e005324381ff9e
Component: engine
2014-06-02 07:32:43 +10:00
b92a4a943f
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
Upstream-commit: 2024a0e517d9b5e009bd8935de60c4782cc1d17a
Component: engine
2014-06-01 01:26:31 +03:00
81343783d4
Updated link to new docker-node-hello repository
...
Upstream-commit: 0658868c7f81dd225df8678f31f7ef70274d8d94
Component: engine
2014-05-31 14:55:59 -06:00
636c18b736
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 1dd02ff4a09218eab47533032d1222008d6419b8
Component: engine
2014-05-31 01:28:08 +00:00
13f5758035
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 23dd221e5250398d4120a1f3d1bcb591923f4892
Component: engine
2014-05-30 11:16:38 +10:00
6a08eb7c32
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
Upstream-commit: 8622641b585d18476f1bc26e1bb5d4298cecf78f
Component: engine
2014-05-29 11:41:43 +10:00
9e0e3e5d33
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 456ba11d89b52f946d293489b52508a2e270f1a7
Component: engine
2014-05-29 11:36:28 +10:00
62daf025f0
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl > (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
e498aa81c8
add support for COPY to docker build
...
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 180c2a678510a93a442f1bcdb6a47287ec88ccd6
Component: engine
2014-05-29 00:07:52 +03:00
8f1ec933f0
Replace 'private' with 'self-hosted' in a couple of places
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: b64535166f4e930121bf9cb624bf2d044c97e472
Component: engine
2014-05-27 18:57:25 -07:00
a398a30f36
Merge pull request #6053 from jamtur01/produpdate
...
Removed Docker production warnings
Upstream-commit: d53eb2f67cbdd632d6e4cad8de9d8f654baa96a3
Component: engine
2014-05-27 18:00:49 -07:00
f0d03df9d1
Merge pull request #6040 from SvenDowideit/installer-docs
...
Rewrite the mac and windows docs to use the boot2docker installers.
Upstream-commit: b76302e5d91da7b66fe0141f4a67636074c886a9
Component: engine
2014-05-28 07:57:43 +10:00
9f78769fba
Rewrite the mac and windows docs to use the boot2docker installers.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5f5d66ade63f8040dd14114f2c7161b16a806c5c
Component: engine
2014-05-28 07:56:15 +10:00
2d2f74e79d
Merge pull request #6005 from jimperrin/master
...
Updated documentation to include CentOS installation instructions.
Upstream-commit: 080d8a7a8367dcf7bdbcac00ec99fbfb05c7ab51
Component: engine
2014-05-28 07:55:03 +10:00
de60cddde3
Removed Docker production warnings
...
* Removed warnings.
* Removed inconsistent Community installation sections.
* Fixed all installation page descriptions.
* Removed old .inc files.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 838e69e11e15dcf6cc1bc73f26602f814ce3698c
Component: engine
2014-05-27 13:08:19 -04:00
aef0b90283
Update documentation per suggestions from ostezer
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: b7e88250f421d34d25f89737c65954150248ee28
Component: engine
2014-05-27 08:59:30 -05:00
94670aa7c3
Update ubuntulinux.md and debian.md
...
to add bash completion for the docker command
Upstream-commit: 250229605f895226fa868120f1a0ea7f4928bf8c
Component: engine
2014-05-27 14:17:01 +02:00
7e9d849ecc
Update fedora.md
...
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
Upstream-commit: b26bebac318803d9dbcd908ccc3be4f2fb9a88b8
Component: engine
2014-05-26 12:29:27 +01:00
feece77cd3
Merge pull request #6001 from jamtur01/introfixes
...
Some fixes to the Intro pages
Upstream-commit: 7393eafde79f67459755ef98d1718c25497783e3
Component: engine
2014-05-25 00:21:40 +10:00
438f9224cd
Some fixes to the Intro pages
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 955bfda99a991e71af3352d18a007d39970cc508
Component: engine
2014-05-25 00:20:59 +10:00
584879665e
Correct appearance of shell output
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: 1cb2570a276020749a0b87444b17f4e6ce78b92d
Component: engine
2014-05-24 08:33:41 -05:00
13006b0ee7
Merge pull request #6006 from therealprologic/master
...
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 22777fbc1e5439883d2e1d5e4fa0e004ea9f4289
Component: engine
2014-05-24 16:08:14 +10:00
dd4e9e1b3f
Merge pull request #6016 from ronsmits/patch-1
...
Update using_supervisord.md
Upstream-commit: d81912e32313a33cb3ad9c1670e7d61effc9517b
Component: engine
2014-05-24 16:07:32 +10:00
c6fc71df20
docs/reference/builder: fix USER doc
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e89cb9a5e0105afbb0c1ba1176bda07d110295bc
Component: engine
2014-05-23 17:20:15 -07:00
4ce695adff
Update using_supervisord.md
...
changed the version of ubuntu to 13.04. In latest sshd will not work.
Upstream-commit: 9429fe6f49a4396cdd0ab2f0b88240ff0239a070
Component: engine
2014-05-23 21:15:44 +02:00
2c5a72f5fe
Fix a few issues.
...
-single-dash => --double-dash for a few flags, and also there was a missing "B", as in "Container B".
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
Upstream-commit: 1e74cd0e01009bfa8afb6058f748f282da5200d0
Component: engine
2014-05-23 09:36:27 -07:00
ff0983f32e
Squashed for pull request
...
Updated documentation to include CentOS installation instructions.
Extraneous line removal, description change
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: 2a35e41a9c825b6891440015ae95633fb84b9604
Component: engine
2014-05-23 10:46:01 -05:00
c375228771
Updated installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
Upstream-commit: c0529e5fc1a50f6fff47646bcc2461aeef20f906
Component: engine
2014-05-24 01:18:00 +10:00
1a0d737a90
Merge pull request #5949 from nathanleclaire/patch-1
...
Change single-dash flag usage to double-dash
Upstream-commit: a6577708abc9370cfe7603a543eb68ad0e37d7e3
Component: engine
2014-05-23 13:43:23 +10:00
456a42e6c9
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
2014-05-22 10:54:05 -07:00
8eeac92781
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
Upstream-commit: 7470ebf30b8b8bce03ae536cebbae71bfbe474f9
Component: engine
2014-05-22 13:43:40 +10:00
0574a90328
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
Upstream-commit: 2fec15cff181775ffc86bd3def69ed41de917367
Component: engine
2014-05-22 11:35:17 +10:00
beaedbfd4c
Change single-dash flag usage to double-dash
...
The single-dash long-form flag usage is deprecated.
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com > (github: nathanleclaire)
Upstream-commit: e7babb28ccb2d451baec9a8cb83e627390cbcdd4
Component: engine
2014-05-21 17:07:04 -07:00
f57c9e34ac
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
Upstream-commit: cd44cd26cbea8837a29e133be6d4fd194f51d39c
Component: engine
2014-05-22 09:55:05 +10:00
26f3790636
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
Upstream-commit: a0260c1181779365a924c913b8e886119d055cf9
Component: engine
2014-05-21 16:53:03 -07:00
9eed719a4d
Added BitBucket support to documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 62468a3eba4d115c16388fb4f67d6adfe4bbb0fc
Component: engine
2014-05-22 08:35:10 +10:00
