From 87c58f01cc60a58ebce2f7d758d46496c15c39d0 Mon Sep 17 00:00:00 2001 From: yzcyayaya <2670408388@qq.com> Date: Tue, 16 Aug 2022 23:31:26 +0800 Subject: [PATCH] docker-compose has been eliminated, changed to docker compose --- docs/administration/log-rotation/_index.md | 2 +- docs/administration/upgrade/_index.md | 2 +- docs/administration/upgrade/roll-back-upgrade.md | 2 +- .../configure-custom-certs.md | 4 ++-- docs/install-config/configure-https.md | 4 ++-- docs/install-config/customize-token-service.md | 2 +- .../install-config/reconfigure-manage-lifecycle.md | 14 +++++++------- docs/install-config/run-installer-script.md | 4 ++-- docs/install-config/troubleshoot-installation.md | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/administration/log-rotation/_index.md b/docs/administration/log-rotation/_index.md index 2f91454fb..7eba045ca 100644 --- a/docs/administration/log-rotation/_index.md +++ b/docs/administration/log-rotation/_index.md @@ -50,7 +50,7 @@ View the purge runs in the **Purge History** table. Harbor tracks information ab 1. Log in to the Harbor interface with an account that has Harbor system administrator privileges. 1. Go to **Configuration** and select **System Settings**. -1. In the **Audit Log Forward Endpoint** row, add your syslog endpoint. If the you installed Harbor with docker-compose, the local syslog endpoint is `harbor-log:10514`. +1. In the **Audit Log Forward Endpoint** row, add your syslog endpoint. If the you installed Harbor with docker compose, the local syslog endpoint is `harbor-log:10514`. 1. If you have configured an endpoint to forward audit logs, you can select the checkbox to **Skip Audit Log Database**. When selected, Harbor will not keep any records of audit logs in its database, but will forward all logs to your configured endpoint immediately. ![Audit log forward endpoint settings](../../img/audit-log-endpoint.png) diff --git a/docs/administration/upgrade/_index.md b/docs/administration/upgrade/_index.md index b9359b06c..ac2ea38cf 100644 --- a/docs/administration/upgrade/_index.md +++ b/docs/administration/upgrade/_index.md @@ -27,7 +27,7 @@ Since the migration might alter the database schema and the settings of `harbor. ```sh cd harbor - docker-compose down + docker compose down ``` 1. Back up Harbor's current files so that you can roll back to the current version if necessary. diff --git a/docs/administration/upgrade/roll-back-upgrade.md b/docs/administration/upgrade/roll-back-upgrade.md index ed0de326d..cc1ca57db 100644 --- a/docs/administration/upgrade/roll-back-upgrade.md +++ b/docs/administration/upgrade/roll-back-upgrade.md @@ -17,7 +17,7 @@ Harbor 2.2 is compiled by Golang 1.15 which deprecated self signed certificate w ```sh cd harbor - docker-compose down + docker compose down ``` 2. Remove current Harbor instance. diff --git a/docs/administration/vulnerability-scanning/configure-custom-certs.md b/docs/administration/vulnerability-scanning/configure-custom-certs.md index 9bd1d8b46..de2d466fb 100644 --- a/docs/administration/vulnerability-scanning/configure-custom-certs.md +++ b/docs/administration/vulnerability-scanning/configure-custom-certs.md @@ -36,8 +36,8 @@ In some cases it might be usefull to provide custom certificate auhtority (CA) b target: /harbor_cust_cert ``` 1. note the binding which mounts to `/harbor_cust_cert` and add your ca-bundle or the single public-certificates into the mount-location, by copying them. -1. (opt) if the host-path doesn't fit for your case, you can also configure another path in the docker-compose file. be aware, that you might have to manually change this, if there are changes on new releases of trivy/harbor. -1. restart your containers (at least trivy-adapter) by using `docker restart trivy-adapter` or `docker-compose restart`. If you changed the bind path, it is necessary to start the services by using `docker-compose up -d` +1. (opt) if the host-path doesn't fit for your case, you can also configure another path in the docker compose file. be aware, that you might have to manually change this, if there are changes on new releases of trivy/harbor. +1. restart your containers (at least trivy-adapter) by using `docker restart trivy-adapter` or `docker compose restart`. If you changed the bind path, it is necessary to start the services by using `docker compose up -d` ## Upgrades Depending on if you changed the path or not an update might overwrite the folder or mount from a different location. The following process makes sure, you don't run into anything unexpected diff --git a/docs/install-config/configure-https.md b/docs/install-config/configure-https.md index 34d29be37..5390e14c2 100644 --- a/docs/install-config/configure-https.md +++ b/docs/install-config/configure-https.md @@ -148,13 +148,13 @@ If you already deployed Harbor with HTTP and want to reconfigure it to use HTTPS Your image data remains in the file system, so no data is lost. ```sh - docker-compose down -v + docker compose down -v ``` 1. Restart Harbor: ```sh - docker-compose up -d + docker compose up -d ``` ## Verify the HTTPS Connection diff --git a/docs/install-config/customize-token-service.md b/docs/install-config/customize-token-service.md index b66a1de95..17c071ff9 100644 --- a/docs/install-config/customize-token-service.md +++ b/docs/install-config/customize-token-service.md @@ -55,7 +55,7 @@ See [Run the Installer Script](run-installer-script.md) or [Reconfigure Harbor a 1. Go back to the `make` directory, and start Harbor by using following command: ```sh - docker-compose up -d + docker compose up -d ``` 1. Push and pull images to and from Harbor to check that your own certificate works. diff --git a/docs/install-config/reconfigure-manage-lifecycle.md b/docs/install-config/reconfigure-manage-lifecycle.md index 51a594438..ade13bc5a 100644 --- a/docs/install-config/reconfigure-manage-lifecycle.md +++ b/docs/install-config/reconfigure-manage-lifecycle.md @@ -3,16 +3,16 @@ title: Reconfigure Harbor and Manage the Harbor Lifecycle weight: 55 --- -You use `docker-compose` to manage the lifecycle of Harbor. This topic provides some useful commands. You must run the commands in the directory in which `docker-compose.yml` is located. +You use `docker compose` to manage the lifecycle of Harbor. This topic provides some useful commands. You must run the commands in the directory in which `docker-compose.yml` is located. -See the [Docker Compose command-line reference](https://docs.docker.com/compose/reference/) for more information about `docker-compose`. +See the [Docker Compose command-line reference](https://docs.docker.com/compose/reference/) for more information about `docker compose`. ## Stop Harbor To stop Harbor, run the following command. ```sh -sudo docker-compose stop +sudo docker compose stop Stopping nginx ... done Stopping harbor-portal ... done Stopping harbor-jobservice ... done @@ -29,7 +29,7 @@ Stopping harbor-log ... done To restart Harbor, run the following command. ```sh -sudo docker-compose start +sudo docker compose start Starting log ... done Starting registry ... done Starting registryctl ... done @@ -48,7 +48,7 @@ To reconfigure Harbor, perform the following steps. 1. Stop Harbor. ```sh - sudo docker-compose down -v + sudo docker compose down -v ``` 1. Update `harbor.yml`. @@ -72,7 +72,7 @@ To reconfigure Harbor, perform the following steps. 1. Re-create and start the Harbor instance. ```sh - sudo docker-compose up -d + sudo docker compose up -d ``` ## Other Commands @@ -80,7 +80,7 @@ To reconfigure Harbor, perform the following steps. Remove Harbor's containers but keep all of the image data and Harbor's database files in the file system: ```sh -sudo docker-compose down -v +sudo docker compose down -v ``` Remove the Harbor database and image data before performing a clean re-installation: diff --git a/docs/install-config/run-installer-script.md b/docs/install-config/run-installer-script.md index 3c23c6001..fa9ce3095 100644 --- a/docs/install-config/run-installer-script.md +++ b/docs/install-config/run-installer-script.md @@ -99,13 +99,13 @@ After you update `daemon.json`, you must restart both Docker Engine and Harbor. 1. Stop Harbor. ```sh - docker-compose down -v + docker compose down -v ``` 1. Restart Harbor. ```sh - docker-compose up -d + docker compose up -d ``` ## What to Do Next ## diff --git a/docs/install-config/troubleshoot-installation.md b/docs/install-config/troubleshoot-installation.md index 96d727dcf..de248a61d 100644 --- a/docs/install-config/troubleshoot-installation.md +++ b/docs/install-config/troubleshoot-installation.md @@ -16,7 +16,7 @@ In addition, Harbor uses `rsyslog` to collect the logs of each container. By def If Harbor does not start or functions incorrectly, run the following command to check whether all of Harbor's containers are in the `Up` state. ``` -sudo docker-compose ps +sudo docker compose ps Name Command State Ports ----------------------------------------------------------------------------------------------------------------------------- harbor-core /harbor/start.sh Up