From b6e89163ecb6b15ff3057de52d82186c39442c30 Mon Sep 17 00:00:00 2001 From: MeIchthys Date: Mon, 15 Sep 2025 22:49:27 -0400 Subject: [PATCH] Revert "Use `docker compose` instead of `docker-compose` (#1702)" (#1708) This reverts commit 2f5a42d864141216aa71dfa256e1ed18a0006c07. --- docs/site-operations.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/site-operations.md b/docs/site-operations.md index ef3b7b07..550d9bdf 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -1,16 +1,16 @@ # Site operations -> 💡 You should setup `--project-name` option in `docker` commands if you have non-standard project name. +> 💡 You should setup `--project-name` option in `docker-compose` commands if you have non-standard project name. ## Setup new site Note: - Wait for the `db` service to start and `configurator` to exit before trying to create a new site. Usually this takes up to 10 seconds. -- Also you have to pass `-p ` if `-p` passed previously eg. `docker -p exec (rest of the command)`. +- Also you have to pass `-p ` if `-p` passed previously eg. `docker-compose -p exec (rest of the command)`. ```sh -docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password +docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password ``` If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`. @@ -18,14 +18,14 @@ If you need to install some app, specify `--install-app`. To see all options, ju To create Postgres site (assuming you already use [Postgres compose override](images-and-compose-files.md#overrides)) you need have to do set `root_login` and `root_password` in common config before that: ```sh -docker exec backend bench set-config -g root_login -docker exec backend bench set-config -g root_password +docker-compose exec backend bench set-config -g root_login +docker-compose exec backend bench set-config -g root_password ``` Also command is slightly different: ```sh -docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password +docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password ``` ## Push backup to S3 storage @@ -33,7 +33,7 @@ docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type p We have the script that helps to push latest backup to S3. ```sh -docker exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key +docker-compose exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key ``` Note that you can restore backup only manually. @@ -59,7 +59,7 @@ Instead of `alpine` use any image of your choice. For socketio and gunicorn service ping the hostname:port and that will be sufficient. For workers and scheduler, there is a command that needs to be executed. ```shell -docker exec backend healthcheck.sh --ping-service mongodb:27017 +docker-compose exec backend healthcheck.sh --ping-service mongodb:27017 ``` Additional services can be pinged as part of health check with option `-p` or `--ping-service`. @@ -72,7 +72,7 @@ If connection to service(s) fails, the command fails with exit code 1. For reference of commands like `backup`, `drop-site` or `migrate` check [official guide](https://frappeframework.com/docs/v13/user/en/bench/frappe-commands) or run: ```sh -docker exec backend bench --help +docker-compose exec backend bench --help ``` ## Migrate site @@ -82,5 +82,5 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to migrate a site. Usually this takes up to 10 seconds. ```sh -docker exec backend bench --site migrate +docker-compose exec backend bench --site migrate ```