Fix some formatting.

This commit is contained in:
Steven R. Baker 2016-01-22 16:20:32 +01:00
parent 27df5a5cb3
commit d721f1c7ae
1 changed files with 34 additions and 20 deletions

View File

@ -128,11 +128,15 @@ FROM neo4j
If you need to make your own configuration changes, we provide a hook so you can do that in a script: If you need to make your own configuration changes, we provide a hook so you can do that in a script:
```dockerfile
COPY extra_conf.sh /extra_conf.sh COPY extra_conf.sh /extra_conf.sh
```
Then you can pass in the `EXTENSION_SCRIPT` environment variable at runtime to source the script: Then you can pass in the `EXTENSION_SCRIPT` environment variable at runtime to source the script:
docker run -e "EXTENSION_SCRIPT=/extra_conf.sh" cafe12345678 ```console
$ docker run -e "EXTENSION_SCRIPT=/extra_conf.sh" cafe12345678
```
When the extension script is sourced, the current working directory will be the root of the Neo4j installation. When the extension script is sourced, the current working directory will be the root of the Neo4j installation.
@ -145,22 +149,30 @@ In order to run Neo4j in HA mode under Docker you need to wire up the containers
Within a single Docker host, this can be achieved as follows. Within a single Docker host, this can be achieved as follows.
docker network create --driver=bridge cluster ```console
$ docker network create --driver=bridge cluster
```
docker run --name=instance1 --detach --publish=7474:7474 --net=cluster --hostname=instance1 \ ```console
$ docker run --name=instance1 --detach --publish=7474:7474 --net=cluster --hostname=instance1 \
--env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance1 --env=NEO4J_SERVER_ID=1 \ --env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance1 --env=NEO4J_SERVER_ID=1 \
--env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \ --env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \
neo4j:enterprise neo4j:enterprise
```
docker run --name=instance2 --detach --publish 7475:7474 --net=cluster --hostname=instance2 \ ```console
$ docker run --name=instance2 --detach --publish 7475:7474 --net=cluster --hostname=instance2 \
--env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance2 --env=NEO4J_SERVER_ID=2 \ --env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance2 --env=NEO4J_SERVER_ID=2 \
--env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \ --env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \
neo4j:enterprise neo4j:enterprise
```
docker run --name=instance3 --detach --publish 7476:7474 --net=cluster --hostname=instance3 \ ```console
$ docker run --name=instance3 --detach --publish 7476:7474 --net=cluster --hostname=instance3 \
--env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance3 --env=NEO4J_SERVER_ID=3 \ --env=NEO4J_DATABASE_MODE=HA --env=NEO4J_HA_ADDRESS=instance3 --env=NEO4J_SERVER_ID=3 \
--env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \ --env=NEO4J_INITIAL_HOSTS=instance1:5001,instance2:5001,instance3:5001 \
neo4j:enterprise neo4j:enterprise
```
## Plugins and unmanaged extensions ## Plugins and unmanaged extensions
@ -190,7 +202,7 @@ A workaround is to run the docker image in privileged mode, by adding `--privile
The current best known solution is to enable the use of ptrace in the docker profile of AppArmor. Do this by adding the following line to `/etc/init.d/docker`: The current best known solution is to enable the use of ptrace in the docker profile of AppArmor. Do this by adding the following line to `/etc/init.d/docker`:
ptrace peer=docker-default, `ptrace peer=docker-default,`
Add this line before the last curly brace, and restart docker. Add this line before the last curly brace, and restart docker.
@ -198,4 +210,6 @@ Add this line before the last curly brace, and restart docker.
To use your own key and certificate, provide an `/ssl` volume with the key and certificate inside. The key filename must end in `.key`, and the certificate in `.cert`. Only one of each file may be present. You must also publish port `7473` to access the HTTPS endpoint. To use your own key and certificate, provide an `/ssl` volume with the key and certificate inside. The key filename must end in `.key`, and the certificate in `.cert`. Only one of each file may be present. You must also publish port `7473` to access the HTTPS endpoint.
docker run --publish 7473:7473 --volume $HOME/neo4j/ssl:/ssl neo4j ```console
$ docker run --publish 7473:7473 --volume $HOME/neo4j/ssl:/ssl neo4j
```