Skip to content

Conversation

mdlinville
Copy link

Describe the proposed changes

Rebase vnext-engine on current state of master

@thaJeztah @johndmulhausen @bfirsh PTAL

I'll need to force-push this, the PR is here just FYI.

Misty Stanley-Jones and others added 20 commits November 30, 2016 15:53
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>
@bfirsh
Copy link
Contributor

bfirsh commented Dec 1, 2016

Sounds good to me (as in, this will help with #606), but I don't know enough about the changes to be able to do a proper review.

@mdlinville
Copy link
Author

So, to review this, I recommend: git difftool upstream/vnext-engine -- engine/ with this PR checked out locally.

I think this rebase is OK to do now since at the time 1.13 is released, the vnext-engine branch will be merged into master and then hard-reset to master.

@mdlinville mdlinville changed the base branch from vnext-engine to master December 1, 2016 18:44
@mdlinville
Copy link
Author

@thaJeztah pointed out that in order to preview the rebase, I needed to be comparing master to the rebased vnext-engine, instead of comparing the old vnext-engine to the rebased one. Again, this PR is just for preview and won't get merged. Instead I'll do a force-push to vnext-engine when review is complete.

@johndmulhausen
Copy link
Contributor

johndmulhausen commented Dec 1, 2016

Deploy preview ready!

Built with commit 421d359

https://deploy-preview-756--docker-docs.netlify.com

Copy link
Author

@mdlinville mdlinville left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think after the two commits I've added to the top of this, this is ready to be force-pushed. WDYT, @thaJeztah ?

@mdlinville
Copy link
Author

BTW I think we can ignore the conflicts since we are not really going to merge this PR as-is.

@johndmulhausen
Copy link
Contributor

Where are we on this? We're holding up #606 which is a pretty critical PR. If you can ignore the conflicts, are we good to go?

@mdlinville
Copy link
Author

The force-push is done! Closing this now.

@mdlinville mdlinville closed this Dec 9, 2016
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.