diff --git a/docs/high_availability_installation_guide.md b/docs/high_availability_installation_guide.md index e6ea618643..4eac2c3b57 100644 --- a/docs/high_availability_installation_guide.md +++ b/docs/high_availability_installation_guide.md @@ -212,8 +212,6 @@ In harbor.cfg redis_url = 192.168.1.217:6379 ``` -If you have multiple Redis servers then separate them with ";" - ##### 7> Provide the Clair DB connection information 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_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** diff --git a/make/ha/docker-compose.clair.tpl b/make/ha/docker-compose.clair.tpl index 3a5590e0c6..108ab53473 100644 --- a/make/ha/docker-compose.clair.tpl +++ b/make/ha/docker-compose.clair.tpl @@ -27,6 +27,8 @@ services: options: syslog-address: "tcp://127.0.0.1:1514" tag: "clair" + env_file: + ./common/config/clair/clair_env networks: harbor-clair: external: false diff --git a/make/ha/docker-compose.tpl b/make/ha/docker-compose.tpl index 223ed4d106..38a14678f4 100644 --- a/make/ha/docker-compose.tpl +++ b/make/ha/docker-compose.tpl @@ -59,7 +59,7 @@ services: volumes: - ./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/certificates/:/etc/ui/certifates/ + - ./common/config/ui/certificates/:/etc/ui/certificates/:z - /data/secretkey:/etc/ui/key:z - /data/ca_download/:/etc/ui/ca/:z - /data/psc/:/etc/ui/token/:z @@ -82,7 +82,7 @@ services: restart: always volumes: - /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 networks: - harbor