docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Fix merge issue on docker-hub/builds.md 

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
This commit is contained in:
O.S. Tezer 2014-06-08 16:03:46 -07:00
parent 23bdb3b3a6
commit c37b4828dd
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/sources/docker-hub/builds.md
View File

@ -102,16 +102,9 @@ to Docker Hub.
#### Creating an Automated Build #### Creating an Automated Build
<<<<<<< HEAD:docs/sources/docker-io/builds.md You can [create an Automated Build](
You can [create an Automated https://registry.hub.docker.com/builds/bitbucket/select/) from any of your
Build](https://index.docker.io/builds/bitbucket/select/) from any of public or private BitBucket repositories with a `Dockerfile`.
your public or private BitBucket repositories with a `Dockerfile`.
=======
You can [create a Trusted
Build](https://registry.hub.docker.com/builds/bitbucket/select/)
from any of your public or private BitBucket repositories with a
`Dockerfile`.
>>>>>>> Initial links:docs/sources/docker-hub/builds.md
### The Dockerfile and Automated Builds ### The Dockerfile and Automated Builds