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-engine on master #734

Closed
wants to merge 550 commits into from
Closed

Rebase vnext-engine on master #734

wants to merge 550 commits into from

Conversation

mdlinville
Copy link

Describe the proposed changes

Merged master into vnext-engine because I needed to propagate the changes to how
we get docker/docker reference docs and so I can finish #583

Unreleased project version

engine 1.13

Please take a look

@thaJeztah there were a few commits here I think you should look at, to make sure I chose the correct side. I'll find them in the list and call them out. I don't expect an exhaustive review.

cc/ @johndmulhausen

johndmulhausen and others added 30 commits November 14, 2016 12:24
machine/gce: explain how to use image families
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Adding Yakkety Deb
Avoiding passive voice in description of adding a GUI to the USER
instruction
- What I did

While reading build documentation I saw two wrong links and proposed fix.

- How I did it

First wrong link: I've change the filter from: is:open is:issue label:kind/test -label:status/claimed -label:status/assigned no:assignee  to: is:issue is:open 
Second wrong link: http://docs.docker.com/project/test-and-docs/ points to "Sorry, we can't find that page", I've change it to:
capital_P_dangit()
…center

fix type of keywords entry in frontmatter (in /datacenter/)
Provide clarification on status of `--link`
* Update understanding-docker.md

* Update understanding-docker.md
Update reschedule on node fail
Add missing word.
Since 1.12.3, custom CA certificates are sourced from the OS X keychain.

/cc @djs55
This makes it easier to fix up the command by just prepending a `sudo` if something goes wrong.
Added a link to the vi text editor website.
Changed keyserver URL for apt-key to hkp://ha.pool.sks-keyservers.net:80 as it is when you install with the get.docker.com script.
The old URL hkp://p80.pool.sks-keyservers.net:80 caused an error about "gnutls_handshake() failed" on apt update.
Added a link to high availability since this is also a link used typically after a POC or trial install. Also matches Store and Email Nurture program emails which reference this.
added more changes

updated per Nathan's comments on properly documenting directories formats for all platforms

incorporated Daniel's review comments, and added a clarification re: users' dir

copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Joao Fernandes and others added 26 commits November 30, 2016 11:43
Update configure nodes to trust DTR with sudo
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
These are new flags to service create/update being added in a Docker
engine PR.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
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>
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>
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: French Ben <frenchben@docker.com>
Fixed incorrect statement about example layout

Related to moby/moby#27918

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
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>
Support for Ubuntu 16.10 was added in
moby/moby#27993
(moby/moby@27beb64)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Akira Koyasu <mail@akirakoyasu.net>
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

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
* Add NATS client as option for publishing container logs

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

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Signed-off-by: French Ben <frenchben@docker.com>
@mdlinville mdlinville changed the title Merge master into vnext-engine Rebase vnext-engine on master Dec 1, 2016
@mdlinville
Copy link
Author

This one is hopeless, opening a new PR.

@mdlinville mdlinville closed this Dec 1, 2016
bermudezmt pushed a commit that referenced this pull request Nov 7, 2018
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.