Skip to content

Commit

Permalink
added docker to glossary
Browse files Browse the repository at this point in the history
  • Loading branch information
cehbrecht committed Mar 13, 2015
1 parent f9ee0d4 commit a4ad36e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions docs/source/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ Glossary
Binstar
Binstar is a service that allows you to create and manage public and private :term:`Anaconda` package repositories.
https://binstar.org/

Docker
*Docker* - An open platform for distributed applications for developers and sysadmins.
https://www.docker.com/
4 changes: 2 additions & 2 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Requirements

Birdhouse uses :term:`Anaconda Python distribution` for most of the dependencies. If Anaconda is not already installed it will be installed during the installation process. Anaconda has packages for Linux, MacOSX and Windows. But not all packages used by Birdhouse are already available in the default package channel of Anaconda. The missing packages are supplied by Birdhouse on :term:`Binstar`. But we currently maintain only packages for Linux 64-bit and partly for MacOSX.

So the short answer to the requirements is: you need a **Linux 64-bit installation**.
So the short answer to the requirements is: **you need a Linux 64-bit installation**.

Birdhouse is currently used on Ubuntu 14.04 and CentOS 6.x. It should also work on Debian, LinuxMint and Fedora.

Expand Down Expand Up @@ -85,7 +85,7 @@ You can also use the Supervisor monitor web service which by default is availabl
Using Birdhouse with Docker
---------------------------

An alternative way to install and deploy Birdhouse Web Processing Services is using `Docker <https://www.docker.com/>`_. The Birdhouse WPS servers are available as Docker image on `Docker Hub <https://registry.hub.docker.com/repos/birdhouse/>`_. See an example on how to use them with the :ref:`Emu WPS Docker image <emu:tutorial>`
An alternative way to install and deploy Birdhouse Web Processing Services is using :term:`Docker`. The Birdhouse WPS servers are available as Docker image on `Docker Hub <https://registry.hub.docker.com/repos/birdhouse/>`_. See an example on how to use them with the :ref:`Emu WPS Docker image <emu:tutorial>`

.. _anaconda:

Expand Down

0 comments on commit a4ad36e

Please sign in to comment.