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

Merge pull request #6292 from ostezer/docs-merge-on-builds

Browse source 
Docs: Fix merge issue on docker-hub/builds.md
This commit is contained in:
Sven Dowideit 2014-06-08 16:09:56 -07:00
commit 23cc3e5c63
1 changed files with 3 additions and 10 deletions
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