Merge branch '2.0' into develop

This commit is contained in:
Cédric Verstraeten
2016-10-23 09:40:25 +02:00

View File

@@ -1,6 +1,6 @@
# Docker
A Docker image is available on [**the Docker Hub**](https://hub.docker.com/u/kerberos/). Before you can run this image you will have to get [**Docker** or **Docker-machine**](https://docker.com) (Windows/OSX) installed. After the installation you can use **docker-compose** to get Kerberos.io up and running. More detailed information can be [**found here**](https://blog.cedric.ws/kerberosio-available-on-docker).
A Docker image is available on [**the Docker Hub**](https://hub.docker.com/u/kerberos/). Before you can run this image you will have to get [**Docker**](https://docker.com) installed. After the installation you can use **docker-compose** to get Kerberos.io up and running. More detailed information can be [**found here**](https://blog.cedric.ws/kerberosio-available-on-docker).
##Docker-compose
@@ -9,12 +9,12 @@ Create a docker-compose.yml file and following configuration:
machinery:
image: kerberos/machinery
ports:
- "8889:8889"
- "8889"
web:
image: kerberos/web
ports:
- "80:80"
- "80"
volumes_from:
- machinery