|
@@ -63,14 +63,24 @@ public or private GitHub repositories with a `Dockerfile`.
|
|
|
|
|
|
### GitHub Submodules
|
|
|
|
|
|
-If your repository contains links to private submodules, you'll
|
|
|
-need to add a deploy key so that the Docker Hub will be able to
|
|
|
-clone the repository from GitHub.
|
|
|
+<<<<<<< HEAD
|
|
|
+If your GitHub repository contains links to private submodules, you'll
|
|
|
+need to add a deploy key from your Docker Hub repository.
|
|
|
|
|
|
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 viewing the Settings page for the
|
|
|
+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".
|
|
|
+=======
|
|
|
+### 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">
|
|
|
<thead>
|
|
@@ -84,17 +94,27 @@ repository on GitHub and selecting "Deploy keys".
|
|
|
<tr>
|
|
|
<td>1.</td>
|
|
|
<td><img src="/docker-hub/hub-images/deploy_key.png"></td>
|
|
|
- <td>Your automated build's deploy key is in the "Build Details" menu under "Deploy keys".</td>
|
|
|
+ <td>Your automated build's deploy key is in the "Build Details" menu
|
|
|
+under "Deploy keys".</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>2.</td>
|
|
|
<td><img src="/docker-hub/hub-images/github_deploy_key.png"></td>
|
|
|
- <td>In your GitHub submodule's repository Settings page, add the deploy key from your Docker Hub Automated Build.</td>
|
|
|
+ <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
|
|
|
+=======
|
|
|
+ <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
|
|
|
made public on GitHub. To verify, you can look at the members tab for your
|