From 5ff7f8e7d1aa57ee92b20dbe715b2cae76dad03c Mon Sep 17 00:00:00 2001 From: shaojun <157350686@qq.com> Date: Wed, 17 Nov 2021 14:36:44 +0800 Subject: [PATCH 1/5] update for change default hostname or port Improve the description for how to change the default hostname, and fix the inaccuracy descrption for port change. --- site/content/en/docs/faq.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/site/content/en/docs/faq.md b/site/content/en/docs/faq.md index 45e8228eb9f6..930df1f03005 100644 --- a/site/content/en/docs/faq.md +++ b/site/content/en/docs/faq.md @@ -49,18 +49,24 @@ You should free up disk space or change the threshold, to do so check: [Elastics To change the hostname, simply set the `CVAT_HOST` environemnt variable ``` -export CVAT_HOST= +export CVAT_HOST= ``` +NOTE, if you're using docker to run CVAT, then please pass in(by `-E`) the environemnt variable which set above to take effect in your docker container: -If you want to change the port, change the `entryPoints.web.address` part of `traefik` image command in `docker-compose.yml` +``` +sudo -E docker-compose up -d +``` + +If you want to change the default web application portal port, change the `ports` part of `traefik` image command in `docker-compose.yml` ``` services: traefik: - command: - - "--providers.docker.exposedByDefault=false" - - "--providers.docker.network=test" - - "--entryPoints.web.address=:" + ... + ... + ports: + - :8080 + - 8090:8090 ``` Note that changing the port does not make sense if you are using HTTPS - port 443 is conventionally From d07dadef0e0f6c7ee416bfd5a20445324c2c1af5 Mon Sep 17 00:00:00 2001 From: shaojun <157350686@qq.com> Date: Mon, 22 Nov 2021 16:56:25 +0800 Subject: [PATCH 2/5] Update site/content/en/docs/faq.md Co-authored-by: Andrey Zhavoronkov --- site/content/en/docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/faq.md b/site/content/en/docs/faq.md index 930df1f03005..0848789cafa3 100644 --- a/site/content/en/docs/faq.md +++ b/site/content/en/docs/faq.md @@ -57,7 +57,7 @@ NOTE, if you're using docker to run CVAT, then please pass in(by `-E`) the envir sudo -E docker-compose up -d ``` -If you want to change the default web application portal port, change the `ports` part of `traefik` image command in `docker-compose.yml` +If you want to change the default web application port, change the `ports` part of `traefik` service configuration in `docker-compose.yml` ``` services: From d521efd7e147aff398099259362c192b626fa233 Mon Sep 17 00:00:00 2001 From: shaojun <157350686@qq.com> Date: Mon, 22 Nov 2021 16:56:31 +0800 Subject: [PATCH 3/5] Update site/content/en/docs/faq.md Co-authored-by: Andrey Zhavoronkov --- site/content/en/docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/faq.md b/site/content/en/docs/faq.md index 0848789cafa3..353b48bca2ad 100644 --- a/site/content/en/docs/faq.md +++ b/site/content/en/docs/faq.md @@ -51,7 +51,7 @@ To change the hostname, simply set the `CVAT_HOST` environemnt variable ``` export CVAT_HOST= ``` -NOTE, if you're using docker to run CVAT, then please pass in(by `-E`) the environemnt variable which set above to take effect in your docker container: +NOTE, if you're using `docker-compose` with `sudo` to run CVAT, then please add the `-E` (or `--preserve-env`) flag to preserve the user environment variable which set above to take effect in your docker containers: ``` sudo -E docker-compose up -d From 7c04ccb65720fe032c4585d668708281237d99b7 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Wed, 1 Dec 2021 06:34:28 +0300 Subject: [PATCH 4/5] Fix linter issues --- site/content/en/docs/faq.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/content/en/docs/faq.md b/site/content/en/docs/faq.md index 353b48bca2ad..a13789376a22 100644 --- a/site/content/en/docs/faq.md +++ b/site/content/en/docs/faq.md @@ -51,7 +51,8 @@ To change the hostname, simply set the `CVAT_HOST` environemnt variable ``` export CVAT_HOST= ``` -NOTE, if you're using `docker-compose` with `sudo` to run CVAT, then please add the `-E` (or `--preserve-env`) flag to preserve the user environment variable which set above to take effect in your docker containers: +NOTE, if you're using `docker-compose` with `sudo` to run CVAT, then please add the `-E` (or `--preserve-env`) +flag to preserve the user environment variable which set above to take effect in your docker containers: ``` sudo -E docker-compose up -d From 86bcb42cd6a09091a4ff4d18569fa87e34bef303 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Wed, 1 Dec 2021 06:34:53 +0300 Subject: [PATCH 5/5] Fix linter issues --- site/content/en/docs/faq.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/content/en/docs/faq.md b/site/content/en/docs/faq.md index a13789376a22..424a3f8118db 100644 --- a/site/content/en/docs/faq.md +++ b/site/content/en/docs/faq.md @@ -58,7 +58,8 @@ flag to preserve the user environment variable which set above to take effect in sudo -E docker-compose up -d ``` -If you want to change the default web application port, change the `ports` part of `traefik` service configuration in `docker-compose.yml` +If you want to change the default web application port, change the `ports` part of `traefik` service configuration +in `docker-compose.yml` ``` services: