kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Removed merge conflict artifacts.

Browse source 
Signed-off-by: Hollie Teal <hollie@docker.com>
This commit is contained in:
Hollie Teal 2014-08-12 15:30:21 -07:00
parent af5ced62ca
commit e608312677
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
docs/sources/docker-hub/builds.md
View file

@ -63,7 +63,6 @@ public or private GitHub repositories with a `Dockerfile`.
### GitHub Submodules ### GitHub Submodules
<<<<<<< HEAD
If your GitHub repository contains links to private submodules, you'll If your GitHub repository contains links to private submodules, you'll
need to add a deploy key from your Docker Hub repository. need to add a deploy key from your Docker Hub repository.
@ -71,16 +70,6 @@ Your Docker Hub deploy key is located under the "Build Details"
menu on the Automated Build's main page in the Hub. Add this key menu on the Automated Build's main page in the Hub. Add this key
to your GitHub submodule by visiting the Settings page for the to your GitHub submodule by visiting the Settings page for the
repository on GitHub and selecting "Deploy keys". repository on GitHub and selecting "Deploy keys".
=======
### GitHub Submodules
If your repository contains links to private submodules, you'll need
to add a deploy key from Docker Hub.
Your Docker Hub deploy key is located under the "Build Details" menu on
the automated build's main page in the Hub. Add this key to your GitHub
submodule by visiting the Settings page for the repository on GitHub and
selecting "Deploy keys".
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
@ -107,14 +96,6 @@ deploy key from your Docker Hub Automated Build.</td>
</table> </table>
### GitHub Organizations ### GitHub Organizations
=======
<td>In your GitHub submodule's repository Settings page, add the deploy key from your Docker Hub automated build.</td>
</tr>
</tbody>
</table>
### GitHub organizations
>>>>>>> dc8b070aaa6c0aa0a6f920ba1a033027b5700ee0
GitHub organizations will appear once your membership to that organization is GitHub organizations will appear once your membership to that organization is
made public on GitHub. To verify, you can look at the members tab for your made public on GitHub. To verify, you can look at the members tab for your