Browse code

Added bitbucket hook info and warning re: validating accounts.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)

Fred Lifton authored on 2014/07/11 08:51:16
Showing 4 changed files
... ...
@@ -28,7 +28,8 @@ Automated Builds are supported for both public and private repositories on both
28 28
 
29 29
 To use Automated Builds, you must have an 
30 30
 [account on Docker Hub](http://docs.docker.com/userguide/dockerhub/#creating-a-docker-hub-account)
31
-and on GitHub and/or Bitbucket.
31
+and on GitHub and/or Bitbucket. The account needs to be properly validated and activated
32
+before you can link to it.
32 33
 
33 34
 ## Setting up Automated Builds with GitHub
34 35
 
... ...
@@ -48,7 +49,8 @@ at the upper right of the screen. Then select
48 48
 
49 49
 Select the [GitHub service](https://registry.hub.docker.com/associate/github/).
50 50
 
51
-Then follow the onscreen instructions to authorize and link your GitHub account to Docker Hub.
51
+Then follow the onscreen instructions to authorize and link your GitHub account to Docker Hub. Once it is linked, you'll be able to choose a repo from which to create the
52
+Automatic Build.
52 53
 
53 54
 ### Creating an Automated Build
54 55
 
... ...
@@ -85,7 +87,8 @@ Automated Build:
85 85
       <td>2.</td>
86 86
       <td><img src="/docker-hub/hub-images/gh_menu.png" alt="Webhooks & Services"></td>
87 87
       <td>Click on "Webhooks & Services" on the left side of the page.</td></tr>
88
-      <tr><td>3.</td><td><img src="/docker-hub/hub-images/gh_service_hook.png" alt="Find the service labeled Docker"></td><td>Find the service labeled "Docker" and click on it.</td></tr>
88
+      <tr><td>3.</td>
89
+      <td><img src="/docker-hub/hub-images/gh_service_hook.png" alt="Find the service labeled Docker"></td><td>Find the service labeled "Docker" and click on it.</td></tr>
89 90
       <tr><td>4.</td><td><img src="/docker-hub/hub-images/gh_docker-service.png" alt="Activate Service Hooks"></td>
90 91
       <td>Make sure the "Active" checkbox is selected and click the "Update service" button to save your changes.</td>
91 92
     </tr>
... ...
@@ -102,10 +105,11 @@ To get started, log into your Docker Hub account and click the "+ Add Repository
102 102
 the upper right of the screen. Then select [Automated Build](https://registry.hub.docker.com/builds/add/).
103 103
 
104 104
 Select the [Bitbucket
105
-service](https://registry.hub.docker.com/associate/bitbucket/).
105
+source](https://registry.hub.docker.com/associate/bitbucket/).
106 106
 
107 107
 Then follow the onscreen instructions to authorize and link your Bitbucket account
108
-to Docker Hub.
108
+to Docker Hub. Once it is linked, you'll be able to choose a repo from which to create
109
+the Automatic Build.
109 110
 
110 111
 ### Creating an Automated Build
111 112
 
... ...
@@ -113,6 +117,42 @@ You can [create an Automated Build](
113 113
 https://registry.hub.docker.com/builds/bitbucket/select/) from any of your
114 114
 public or private Bitbucket repositories with a `Dockerfile`.
115 115
 
116
+### Adding a Hook
117
+
118
+When you link your Docker Hub account, a `POST` hook should get automatically added to
119
+your Bitbucket repo.
120
+Follow the steps below to confirm or modify the Bitbucket hooks for your
121
+Automated Build:
122
+
123
+<table class="table table-bordered">
124
+  <thead>
125
+    <tr>
126
+      <th>Step</th>
127
+      <th>Screenshot</th>
128
+      <th>Description</th>
129
+    </tr>
130
+  </thead>
131
+  <tbody>
132
+    <tr>
133
+      <td>1.</td>
134
+      <td><img src="/docker-hub/hub-images/bb_menu.png" alt="Settings" width="180"></td>
135
+      <td>Log in to Bitbucket.org and go to your Repository page. Click on "Settings" on
136
+      the far left side of the page, under "Navigation". You must have admin privileges
137
+      to the repository in order to do this.</td>
138
+    </tr>
139
+    <tr>
140
+      <td>2.</td>
141
+      <td><img src="/docker-hub/hub-images/bb_hooks.png" alt="Hooks" width="180"></td>
142
+      <td>Click on "Hooks" on the near left side of the page, under "Settings".</td></tr>
143
+    <tr>
144
+      <td>3.</td>
145
+      <td><img src="/docker-hub/hub-images/bb_post-hook.png" alt="Docker Post Hook"></td><td>You should now see a list of hooks associated with the repo, including a <code>POST</code> hook that points at
146
+      registry.hub.docker.com/hooks/bitbucket.</td>
147
+    </tr>
148
+  </tbody>
149
+</table>
150
+
151
+
116 152
 ## The Dockerfile and Automated Builds
117 153
 
118 154
 During the build process, Docker will copy the contents of your `Dockerfile`. It will
119 155
new file mode 100644
120 156
Binary files /dev/null and b/docs/sources/docker-hub/hub-images/bb_hooks.png differ
121 157
new file mode 100644
122 158
Binary files /dev/null and b/docs/sources/docker-hub/hub-images/bb_menu.png differ
123 159
new file mode 100644
124 160
Binary files /dev/null and b/docs/sources/docker-hub/hub-images/bb_post-hook.png differ