Merge pull request #4640 from yixingjia/HA15Docs

Update HA template and User guide
This commit is contained in:
yixingjia 2018-04-13 11:52:01 +08:00 committed by GitHub
commit dce1896d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -212,8 +212,6 @@ In harbor.cfg
redis_url = 192.168.1.217:6379 redis_url = 192.168.1.217:6379
``` ```
If you have multiple Redis servers then separate them with ";"
##### 7> Provide the Clair DB connection information ##### 7> Provide the Clair DB connection information
In harbor.cfg In harbor.cfg
@ -247,7 +245,7 @@ For example if you use swift as the storage backend then you need to set the fol
``` ```
registry_storage_provider_name = swift registry_storage_provider_name = swift
registry_storage_provider_config = username:yourusername,password:yourpass,authurl:http://192.168.1.217/identity/v3,tenant:admin,domain:default,region:RegionOne,container:docker_images registry_storage_provider_config = username: yourusername,password: yourpass,authurl: http://192.168.1.217/identity/v3,tenant: admin,domain: default,region: RegionOne,container: docker_images
``` ```
**Important** **Important**

View File

@ -27,6 +27,8 @@ services:
options: options:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "clair" tag: "clair"
env_file:
./common/config/clair/clair_env
networks: networks:
harbor-clair: harbor-clair:
external: false external: false

View File

@ -59,7 +59,7 @@ services:
volumes: volumes:
- ./common/config/ui/app.conf:/etc/ui/app.conf:z - ./common/config/ui/app.conf:/etc/ui/app.conf:z
- ./common/config/ui/private_key.pem:/etc/ui/private_key.pem:z - ./common/config/ui/private_key.pem:/etc/ui/private_key.pem:z
- ./common/config/ui/certificates/:/etc/ui/certifates/ - ./common/config/ui/certificates/:/etc/ui/certificates/:z
- /data/secretkey:/etc/ui/key:z - /data/secretkey:/etc/ui/key:z
- /data/ca_download/:/etc/ui/ca/:z - /data/ca_download/:/etc/ui/ca/:z
- /data/psc/:/etc/ui/token/:z - /data/psc/:/etc/ui/token/:z
@ -82,7 +82,7 @@ services:
restart: always restart: always
volumes: volumes:
- /data/job_logs:/var/log/jobs:z - /data/job_logs:/var/log/jobs:z
- ./common/config/jobservice/app.conf:/etc/jobservice/app.conf:z - ./common/config/jobservice/config.yml:/etc/jobservice/config.yml:z
- /data/secretkey:/etc/jobservice/key:z - /data/secretkey:/etc/jobservice/key:z
networks: networks:
- harbor - harbor