Skip to content
This repository has been archived by the owner on Jul 24, 2021. It is now read-only.

Commit

Permalink
remove the bit that pushes docker images to hub.docker, and remove me…
Browse files Browse the repository at this point in the history
…ntion of it from the docs

(cherry picked from commit 0ccfb74 - see pull request #881)
  • Loading branch information
sungo authored and karenetheridge committed Sep 11, 2019
1 parent 25d75d6 commit 112c428
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
15 changes: 4 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,14 @@ including database connectivity information.

## Docker

### Images

For every release, the Joyent test infrastructure publishes a docker image to
hub.docker.com . These images are available at
https://hub.docker.com/r/joyentbuildops/conch-api/tags and it is wise to
consult the Github release page ( https://github.com/joyent/conch/releases ) to
determine if the release is a staging or production image.

The 'latest' image is not supported and is rebuilt manually and infrequently.
*Always* use a release tag.

### Compose

The most simple way to get going with the Conch API is to use Docker Compose.

#### Build

First, build the image locally using `docker/builder.sh`

#### First Run

Copy `conch.conf.dist` to `conch.conf`, modifying for any local parameters.
Expand Down
5 changes: 1 addition & 4 deletions docker/buildbot-release.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ docker run \
--rm \
--entrypoint=make \
${PREFIX}/conch-api:${LABEL} \
test \
&& \
docker push ${PREFIX}/conch-api:${LABEL}

test
4 changes: 1 addition & 3 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ largely be determined in-house.

* When the tag is pushed into Github, Buildbot executes a test run
and, if successful, creates a new Github release. The text of that
release is the changelog that was posted in the relevant tag. Buildbot also
creates a docker image of the release and makes it available on
[hub.docker](https://hub.docker.com/r/joyentbuildops/conch-api).
release is the changelog that was posted in the relevant tag.

* This new release is pushed into staging by a member of the Conch team using
Ansible (see the private
Expand Down

0 comments on commit 112c428

Please sign in to comment.