Skip to content

Commit

Permalink
Merge pull request #269 from mozilla/eviljeff-patch-1
Browse files Browse the repository at this point in the history
Docker Hub -> CircleCI
  • Loading branch information
eviljeff committed Oct 31, 2016
2 parents 631d214 + a64ac04 commit 7e097d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,6 @@
'https://calendar.google.com/calendar/embed*',
# This is a private URL.
'https://github.com/mozilla/addons-server-security',
# TravisCI doesn't like CircleCI (or otherwise) so we get a 404
'https://circleci.com/gh/mozilla*'
]
6 changes: 3 additions & 3 deletions docs/server/push-duty.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Tags are of the format: ``YYYY.MM.DD``,
.. note:: The date is the date of the push, not the date of tagging.

.. note:: Once addons-frontend has been tagged a new docker image will be
built on `Docker Hub`_ and is
built on `CircleCI`_ and is
required to deploy to stage.

It's usually the master branch that is tagged::
Expand Down Expand Up @@ -135,7 +135,7 @@ Push to stage
+++++++++++++

Once the tag is ready and any needed
`Docker Hub`_ containers have been built, it
`CircleCI`_ containers have been built, it
needs to be pushed to the staging server, using the `IRC bot in #amopush
<https://mana.mozilla.org/wiki/display/SVCOPS/AMO+Dev+Resources#AMODevResources-DeployingwithJenkinsBot>`_.
Consult the IRC bot docs for more up to date information but here are examples
Expand Down Expand Up @@ -213,4 +213,4 @@ Future Goals

Move to continuous deployment and change the way this is done dramatically.

.. _`Docker Hub`: https://hub.docker.com/r/addons/addons-frontend/builds/
.. _`CircleCI`: https://circleci.com/gh/mozilla/addons-frontend

0 comments on commit 7e097d5

Please sign in to comment.