From 07a9003ded03354688b4691bee52e463c38abff6 Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 11:27:22 +0800 Subject: [PATCH 1/7] update documents --- AUTHORS | 4 ++++ README.md | 4 ++-- docs/configure_https.md | 14 +++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index 046403d5a..38ec387e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,10 +1,14 @@ # This file lists all individuals having contributed content to the repository. +Amanda Zhang Bobby Zhang Daniel Jiang Haining Henry Zhang Hao Xia +Jack Liu Kun Wang Shan Zhu +Victoria Zheng Wenkai Yin +Yan Wang diff --git a/README.md b/README.md index e94a80be9..5a6c5612e 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ We welcome contributions from the community. If you wish to contribute code, we Harbor is available under the [Apache 2 license](LICENSE). ### Partners -DataMan +DataMan SlamTec ### Users -MaDaiLiCai SlamTec +MaDaiLiCai diff --git a/docs/configure_https.md b/docs/configure_https.md index 2acf58f0b..badb7fde1 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -4,7 +4,7 @@ Because Harbor does not ship with any certificates, it uses HTTP by default to s ##Get a certificate -Assuming that your registry’s **hostname** is **reg.yourdomain.com**, and that its DNS record points to the host where you are running Harbor, you first should get a certificate from a CA. The certificate usually contains a .crt file and a .key file, for example, **yourdomain.com.crt** and **yourdomain.com.key**. +Assuming that your registry’s **hostname** is **reg.yourdomain.com**, and that its DNS record points to the host where you are running Harbor. You first should get a certificate from a CA. The certificate usually contains a .crt file and a .key file, for example, **yourdomain.com.crt** and **yourdomain.com.key**. In a test or development environment, you may choose to use a self-signed certificate instead of the one from a CA. The below commands generate your own certificate: @@ -20,9 +20,9 @@ In a test or development environment, you may choose to use a self-signed certif -newkey rsa:4096 -nodes -sha256 -keyout yourdomain.com.key \ -out yourdomain.com.csr ``` -3) Generate the certificate of your registry host +3) Generate the certificate of your registry host: -You need to configure openssl first. On Ubuntu, the config file locates at /etc/ssl/openssl.cnf. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let’s creates necessary directories and files: +You need to configure openssl first. On Ubuntu, the config file locates at /etc/ssl/openssl.cnf. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let’s create necessary directories and files: ``` mkdir demoCA cd demoCA @@ -32,7 +32,7 @@ You need to configure openssl first. On Ubuntu, the config file locates at /etc/ ``` Then run this command to generate the certificate of your registry host: ``` - openssl ca -in yourdomain.com.csr -out yourdomain.com.crt -cert ca.crt -keyfile ca.key –outdir . + openssl ca -in yourdomain.com.csr -out yourdomain.com.crt -cert ca.crt -keyfile ca.key -outdir . ``` ##Configuration of Nginx @@ -50,7 +50,7 @@ Copy the template **nginx.https.conf** as the new configuration file: ``` cp nginx.https.conf nginx.conf ``` -Edit the file nginx.conf and replace two occurrences of **server name** harbordomain.com to your own host name: reg.yourdomain.com . +Edit the file nginx.conf and replace two occurrences of **harbordomain.com** to your own host name, such as reg.yourdomain.com . ``` server { listen 443 ssl; @@ -106,11 +106,11 @@ After setting up HTTPS for Harbor, you can verify it by the follow steps: docker login reg.yourdomain.com ``` ##Troubleshooting -1.` `You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: +1. You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: ``` cat intermediate-certificate.pem >> yourdomain.com.crt ``` -2.` `On some systems where docker daemon runs, you may need to trust the certificate at OS level. +2. On some systems where docker daemon runs, you may need to trust the certificate at OS level. On Ubuntu, this can be done by below commands: ``` cp youdomain.com.crt /usr/local/share/ca-certificates/reg.yourdomain.com.crt From 9eca5327fcde9de9ee2710f31b219fcabce5c4d4 Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 11:34:57 +0800 Subject: [PATCH 2/7] update documents --- README.md | 2 +- docs/img/slamteclogo.png | Bin 3701 -> 3091 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a6c5612e..f3b91b78e 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ We welcome contributions from the community. If you wish to contribute code, we Harbor is available under the [Apache 2 license](LICENSE). ### Partners -DataMan SlamTec +DataMan SlamTec ### Users MaDaiLiCai diff --git a/docs/img/slamteclogo.png b/docs/img/slamteclogo.png index 4b64279eba4d0ecc0b83b74399eb7e8f79fe143e..4ed39f5cf2f48ea03e50b6b36113110b610cc94b 100644 GIT binary patch literal 3091 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 Date: Thu, 31 Mar 2016 11:37:08 +0800 Subject: [PATCH 3/7] update documents --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3b91b78e..fb0181f95 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ We welcome contributions from the community. If you wish to contribute code, we Harbor is available under the [Apache 2 license](LICENSE). ### Partners -DataMan SlamTec +DataMan     SlamTec ### Users MaDaiLiCai From d05d9d708857b008578ea2165014c04f8f02f219 Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 11:50:00 +0800 Subject: [PATCH 4/7] update https guide --- docs/configure_https.md | 42 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/configure_https.md b/docs/configure_https.md index badb7fde1..034359736 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -4,7 +4,7 @@ Because Harbor does not ship with any certificates, it uses HTTP by default to s ##Get a certificate -Assuming that your registry’s **hostname** is **reg.yourdomain.com**, and that its DNS record points to the host where you are running Harbor. You first should get a certificate from a CA. The certificate usually contains a .crt file and a .key file, for example, **yourdomain.com.crt** and **yourdomain.com.key**. +Assuming that your registry's **hostname** is **reg.yourdomain.com**, and that its DNS record points to the host where you are running Harbor. You first should get a certificate from a CA. The certificate usually contains a .crt file and a .key file, for example, **yourdomain.com.crt** and **yourdomain.com.key**. In a test or development environment, you may choose to use a self-signed certificate instead of the one from a CA. The below commands generate your own certificate: @@ -22,7 +22,7 @@ In a test or development environment, you may choose to use a self-signed certif ``` 3) Generate the certificate of your registry host: -You need to configure openssl first. On Ubuntu, the config file locates at /etc/ssl/openssl.cnf. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let’s create necessary directories and files: +You need to configure openssl first. On Ubuntu, the config file locates at /etc/ssl/openssl.cnf. Refer to openssl document for more information. The default CA directory of openssl is called demoCA. Let's create necessary directories and files: ``` mkdir demoCA cd demoCA @@ -40,7 +40,7 @@ After obtaining the **yourdomain.com.crt** and **yourdomain.com.key** files, cha ``` cd Deploy/config/nginx ``` -Create a new directory “cert/” if it does not exist. Then copy **yourdomain.com.crt** and **yourdomain.com.key** to cert/. +Create a new directory cert/, if it does not exist. Then copy **yourdomain.com.crt** and **yourdomain.com.key** to cert/. Rename the existing configuration file of Nginx: ``` @@ -56,22 +56,20 @@ Edit the file nginx.conf and replace two occurrences of **harbordomain.com** to listen 443 ssl; server_name harbordomain.com; -… - + ... + server { listen 80; server_name harbordomain.com; rewrite ^/(.*) https://$server_name$1 permanent; - ``` Then look for the SSL section to make sure the files of your certificates match the names in the config file. Do not change the path of the files. ``` -… - + ... + # SSL ssl_certificate /etc/nginx/cert/yourdomain.com.crt; ssl_certificate_key /etc/nginx/cert/yourdomain.com.key; - ``` Save your changes in nginx.conf. @@ -95,29 +93,29 @@ If Harbor is already running, stop and remove the existing instance. Your image ``` Finally, restart Harbor: ``` - docker-compose up –d + docker-compose up -d ``` After setting up HTTPS for Harbor, you can verify it by the follow steps: 1. Open a browser and enter the address: https://reg.yourdomain.com . It should display the user interface of Harbor. -2. On a machine with Docker daemon, make sure the option “--insecure-registry” does not present, run any docker command to verify the setup, e.g. +2. On a machine with Docker daemon, make sure the option "-insecure-registry" does not present, run any docker command to verify the setup, e.g. ``` docker login reg.yourdomain.com ``` ##Troubleshooting 1. You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: -``` - cat intermediate-certificate.pem >> yourdomain.com.crt -``` + ```sh + cat intermediate-certificate.pem >> yourdomain.com.crt + ``` 2. On some systems where docker daemon runs, you may need to trust the certificate at OS level. On Ubuntu, this can be done by below commands: -``` - cp youdomain.com.crt /usr/local/share/ca-certificates/reg.yourdomain.com.crt - update-ca-certificates -``` + ```sh + cp youdomain.com.crt /usr/local/share/ca-certificates/reg.yourdomain.com.crt + update-ca-certificates + ``` On Red Hat (CentOS etc), the commands are: -``` - cp yourdomain.com.crt /etc/pki/ca-trust/source/anchors/reg.yourdomain.com.crt - update-ca-trust - + ```sh + cp yourdomain.com.crt /etc/pki/ca-trust/source/anchors/reg.yourdomain.com.crt + update-ca-trust + ``` From c64e1d683a801244aa00987b85fe85ba507816ff Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 12:12:58 +0800 Subject: [PATCH 5/7] update https docs --- docs/configure_https.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/configure_https.md b/docs/configure_https.md index 034359736..5a8f5c971 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -58,10 +58,10 @@ Edit the file nginx.conf and replace two occurrences of **harbordomain.com** to ... - server { - listen 80; - server_name harbordomain.com; - rewrite ^/(.*) https://$server_name$1 permanent; + server { + listen 80; + server_name harbordomain.com; + rewrite ^/(.*) https://$server_name$1 permanent; ``` Then look for the SSL section to make sure the files of your certificates match the names in the config file. Do not change the path of the files. ``` @@ -109,12 +109,13 @@ After setting up HTTPS for Harbor, you can verify it by the follow steps: cat intermediate-certificate.pem >> yourdomain.com.crt ``` 2. On some systems where docker daemon runs, you may need to trust the certificate at OS level. - On Ubuntu, this can be done by below commands: + On Ubuntu, this can be done by below commands: ```sh cp youdomain.com.crt /usr/local/share/ca-certificates/reg.yourdomain.com.crt update-ca-certificates ``` - On Red Hat (CentOS etc), the commands are: + + On Red Hat (CentOS etc), the commands are: ```sh cp yourdomain.com.crt /etc/pki/ca-trust/source/anchors/reg.yourdomain.com.crt update-ca-trust From aa4d88faea3cdacc00087daf535778f02fbd1f2c Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 12:18:15 +0800 Subject: [PATCH 6/7] update docs --- AUTHORS | 1 + docs/configure_https.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 38ec387e5..6f1faa6e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ # This file lists all individuals having contributed content to the repository. Amanda Zhang +Ben Niu Ji Bobby Zhang Daniel Jiang Haining Henry Zhang diff --git a/docs/configure_https.md b/docs/configure_https.md index 5a8f5c971..7193e8395 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -104,7 +104,7 @@ After setting up HTTPS for Harbor, you can verify it by the follow steps: docker login reg.yourdomain.com ``` ##Troubleshooting -1. You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: +1. You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: ```sh cat intermediate-certificate.pem >> yourdomain.com.crt ``` From 1c906b6e241430ecffb457849c1ad07c142834d9 Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Thu, 31 Mar 2016 12:21:04 +0800 Subject: [PATCH 7/7] update docs --- docs/configure_https.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configure_https.md b/docs/configure_https.md index 7193e8395..e366cb5d7 100644 --- a/docs/configure_https.md +++ b/docs/configure_https.md @@ -105,7 +105,7 @@ After setting up HTTPS for Harbor, you can verify it by the follow steps: ``` ##Troubleshooting 1. You may get an intermediate certificate from a certificate issuer. In this case, you should merge the intermediate certificate with your own certificate to create a certificate bundle. You can achieve this by the below command: - ```sh + ``` cat intermediate-certificate.pem >> yourdomain.com.crt ``` 2. On some systems where docker daemon runs, you may need to trust the certificate at OS level.