diff --git a/README.md b/README.md index 0b577b5c3..c9500413c 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Harbor is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CN **System requirements:** -**On a Linux host:** docker 17.03.0-ce+ and docker-compose 1.18.0+ . +**On a Linux host:** docker 17.06.0-ce+ and docker-compose 1.18.0+ . Download binaries of **[Harbor release ](https://github.com/vmware/harbor/releases)** and follow **[Installation & Configuration Guide](docs/installation_guide.md)** to install Harbor. diff --git a/docs/configure_https.md b/docs/configure_https.md index 8cf9dee40..5ed989311 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -113,17 +113,24 @@ Notice that you may need to trust the certificate at OS level. Please refer to t **3) Configure Harbor** -Edit the file ```harbor.cfg```, update the hostname and the protocol, and update the attributes ```ssl_cert``` and ```ssl_cert_key```: +Edit the file `harbor.yml`, update the hostname and uncomment the https block, and update the attributes `certificate` and `private_key`: + +```yaml +#set hostname +hostname: yourdomain.com + +http: + port: 80 + +https: + # https port for harbor, default is 443 + port: 443 + # The path of cert and key files for nginx + certificate: /data/cert/yourdomain.com.crt + private_key: /data/cert/yourdomain.com.key -``` - #set hostname - hostname = yourdomain.com:port - #set ui_url_protocol - ui_url_protocol = https ...... - #The path of cert and key files for nginx, they are applied only the protocol is set to https - ssl_cert = /data/cert/yourdomain.com.crt - ssl_cert_key = /data/cert/yourdomain.com.key + ``` Generate configuration files for Harbor: diff --git a/docs/installation_guide.md b/docs/installation_guide.md index cef1a147d..687beb094 100644 --- a/docs/installation_guide.md +++ b/docs/installation_guide.md @@ -30,7 +30,7 @@ Harbor is deployed as several Docker containers, and, therefore, can be deployed |Software|Version|Description| |---|---|---| -|Docker engine|version 17.03.0-ce+ or higher|For installation instructions, please refer to: [docker engine doc](https://docs.docker.com/engine/installation/)| +|Docker engine|version 17.06.0-ce+ or higher|For installation instructions, please refer to: [docker engine doc](https://docs.docker.com/engine/installation/)| |Docker Compose|version 1.18.0 or higher|For installation instructions, please refer to: [docker compose doc](https://docs.docker.com/compose/install/)| |Openssl|latest is preferred|Generate certificate and keys for Harbor|