Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase vnext-compose (less a couple commits) onto master #1196

Merged
merged 666 commits into from
Jan 19, 2017
Merged

Rebase vnext-compose (less a couple commits) onto master #1196

merged 666 commits into from
Jan 19, 2017

Conversation

mdlinville
Copy link

Proposed changes

cc @johndmulhausen

luojie233 and others added 30 commits December 20, 2016 17:16
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
Signed-off-by: tim-zju <21651152@zju.edu.cn>
* fix the grammer in aws.md

* a and an
Removes some spaces that were apparently b0rking the code block there.
Add release notes for DTR 2.1.3
Signed-off-by: tim-zju <21651152@zju.edu.cn>
spell errors: misusing a and an
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Add release notes for 1.12.5-cs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
updated d4mac release notes re: hotfix
Forgotten </td> caused table explosion
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Signed-off-by: Adrien Duermael <adrien@duermael.com>
Signed-off-by: Adrien Duermael <adrien@duermael.com>
Signed-off-by: Adrien Duermael <adrien@duermael.com>
Misty Stanley-Jones and others added 28 commits January 18, 2017 13:28
Update instructions for systemd drop-ins
Signed-off-by: LRubin <lrubin@docker.com>
adds more info about valid docker ID
swarm beta docs for limited publish
Update 'usingdocker' tutorial to name the container
optimize  selectadriver.md
Restart the docker daemon after group changes
* Clarify the command only for docker-machine
* minor copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Update instructions for IPv6-enabled networks
Revert "Restart the docker daemon after group changes"
--hyper-cpu-count => --hyper-vlan-id
Update networkingcontainers.md
Add prereqs to AUFS configuration steps
Update to usingdocker.md
Updating dockervolumes.md for Windows mounting
Improved description for Hello-World
Standardize formatting and content, add logging examples
Signed-off-by: LRubin <lrubin@docker.com>
take a stab at fixing a broken link
* Sync vnext-engine branch to docker/docker SHA 2f12d28

This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs

* swarm: Document rollback, failure threshold, and monitor flags

These are new flags to service create/update being added in a Docker
engine PR.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

* Remove Fedora 22 as it's EOL

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* update apparmor documentation to reflect changes in 1.13.0

Updates the apparmor docs to reflect recent changes, specifically that
we are no longer saving to /etc/apparmor.d/. Also removes the seccomp
profile and instead links to the generating template.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

* Added details about tag support for AWS log driver

Signed-off-by: French Ben <frenchben@docker.com>

* Changed wording for tag description

* Updated docs to show full container ID

* Updated wording on log stream default

Signed-off-by: French Ben <frenchben@docker.com>

* Added raw tags

Signed-off-by: French Ben <frenchben@docker.com>

* Update note about custom certs with system certs

Fixed incorrect statement about example layout

Related to moby/moby#27918

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

* Remove Ubuntu 15.10 Wily Werewolf

As of July 28, 2016, Ubuntu 15.10 is officially EOL
(https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html),
and will receive no further updates.

Support for 15.10 was removed in Docker 1.13 through
moby/moby#27042

(moby/moby@e9a8105)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Add Ubuntu 16.10 Yakkety Yak

Support for Ubuntu 16.10 was added in
moby/moby#27993
(moby/moby@27beb64)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* add unix-sockets support in Fluentd logging driver

Signed-off-by: Akira Koyasu <mail@akirakoyasu.net>

* Add engine changes that were lost in syncing

When syncing docs from the docker/docker repository (e4bce35)
some commits were not included. This includes those changes, by copying the documentation from

moby/moby@8658748,
which is the last commit before the docs were removed from the docker/docker
repository in moby/moby@29f08cf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Create logentries.md (#244)

* Create logentries.md

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* Add NATS client as option for publishing container logs (#369)

* Add NATS client as option for publishing container logs

Signed-off-by: Waldemar Quevedo <waldemar.quevedo@gmail.com>

* Document ability to update a service's image

Fixes #528

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

* First version of stack deployment tutorial

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

* Initial dump of CLI in yaml (#737)

Signed-off-by: French Ben <frenchben@docker.com>

* Document new CPU scheduling flags

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

* Update dockerfile vnext (#874)

* Merge pull request #731 from mstanleyjones/distribution_docs_from_upstream

Pull distribution reference docs from upstream repo

* Bump Engine ref docs branch to 1.13.x

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

* Rename Remote API to Engine API

See moby/moby#28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Move accounts API docs to Docker ID section

Makes more sense here instead of the Engine reference. It is
only consumed by the Engine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Add automatically generated Engine API docs

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Upgrade to ReDoc 1.6.2 (#891)

To make use of x-displayName added in
moby/moby#29401

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Add full documentation for APIs and SDKs

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Updated Yaml files (#922)

Signed-off-by: French Ben <frenchben@docker.com>

* Added latest docs from Editions AWS & Azure (#887)

* Added Docker for AWS and Azure and moved navigation

Signed-off-by: French Ben <frenchben@docker.com>

* Fixed image links

Signed-off-by: French Ben <frenchben@docker.com>

* Restructure navigation for Editions

* Fixing double curly braces

* YAML-sourced CLI refdocs

* Add 'docker' label to commands

* Fix for blank node

* Document Docker secrets

Fixes #529

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

* Update syntax of the -f flag in the examples

* Update the syntax of 'docker secret create' in the examples

* Document the ability to publish a port locally on a swarm node

* Add info about image resolution with content trust

* Add examples to CLI generation templates

* remove confusing sentence from "publishing" section

the routing mesh should work irregardless of all
replicas being up or not, so removing this sentence.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Rewrite and reorganize Linux install instructions

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

* Fix typo in Oracle install instructions

* Updated docs to remove beta and stable link (#1160)

* Updated docs to remove beta and stable link

* Addressing feedback from new installation instructions (#1172)

* Address feedback for new installation instructions

* Updating the repo files for Oracle since  does not expand to only the number

* Added latest docs from Editions AWS & Azure (#887)

* Added Docker for AWS and Azure and moved navigation

Signed-off-by: French Ben <frenchben@docker.com>

* Fixed image links

Signed-off-by: French Ben <frenchben@docker.com>

* Restructure navigation for Editions

* Fix a couple of Liquid errors

* Merge pull request #1188 from docker/linkfix-john

Link fixes and link to app tutorial
@johndmulhausen johndmulhausen merged commit c2f3645 into docker:master Jan 19, 2017
@mdlinville mdlinville deleted the vnext-compose-test branch January 19, 2017 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet