diff --git a/docs/modules/deployment/pages/core/docker/core.adoc b/docs/modules/deployment/pages/core/docker/core.adoc index ac7d00cc9aa3..f01107299439 100644 --- a/docs/modules/deployment/pages/core/docker/core.adoc +++ b/docs/modules/deployment/pages/core/docker/core.adoc @@ -65,5 +65,5 @@ TIP: To run a release candidate or a different version, use the public image tag .Validate your Docker Compose file [source, console] ---- -docker-compose config -q +docker compose config -q ---- diff --git a/docs/modules/deployment/pages/core/docker/initialize.adoc b/docs/modules/deployment/pages/core/docker/initialize.adoc index 2fc650a14f2e..6f800782ab9f 100644 --- a/docs/modules/deployment/pages/core/docker/initialize.adoc +++ b/docs/modules/deployment/pages/core/docker/initialize.adoc @@ -8,13 +8,13 @@ chown 10001:10001 -R etc .Initialize the database and schema and a configuration directory [source, console] ---- -docker-compose run horizon -i +docker compose run horizon -i ---- .Start service in background [source, console] ---- -docker-compose up -d +docker compose up -d ---- TIP: You can also use this command when you run upgrades. @@ -23,9 +23,9 @@ TIP: You can also use this command when you run upgrades. + + Show configuration changes from a pristine system with + - `docker-compose exec -w /opt/opennms/bin horizon ./config-diff.sh -d`. + `docker compose exec -w /opt/opennms/bin horizon ./config-diff.sh -d`. + + If you changed your configuration files manually you can run the configuration tester with + - `docker-compose exec horizon bin/config-tester -a` + `docker compose exec horizon bin/config-tester -a` diff --git a/docs/modules/deployment/pages/core/docker/postgresql.adoc b/docs/modules/deployment/pages/core/docker/postgresql.adoc index 02182dafb4af..b657dfeae51c 100644 --- a/docs/modules/deployment/pages/core/docker/postgresql.adoc +++ b/docs/modules/deployment/pages/core/docker/postgresql.adoc @@ -43,13 +43,13 @@ services: .Start the service and run it in background [source, console] ---- -docker-compose up -d +docker compose up -d ---- .Verify the PostgreSQL process is up and running [source, console] ---- -docker-compose ps +docker compose ps ---- .The state should be Up (healthy) and the TCP port should be available on all interfaces diff --git a/docs/modules/deployment/pages/minion/docker/minion.adoc b/docs/modules/deployment/pages/minion/docker/minion.adoc index c45c1cbbdf23..a0eb42832362 100644 --- a/docs/modules/deployment/pages/minion/docker/minion.adoc +++ b/docs/modules/deployment/pages/minion/docker/minion.adoc @@ -101,7 +101,7 @@ Next, we need to create the keystore file and add the credentials for connecting ---- mkdir keystore chown -R 10001:10001 keystore<1> -docker-compose run --rm -v $(pwd)/keystore:/keystore minion -s<2> +docker compose run --rm -v $(pwd)/keystore:/keystore minion -s<2> ---- <1> Assign ownership so the container user account can write within the directory. <2> When prompted, enter the username and password for a `ROLE_MINION` user account on the {page-component-title} server. @@ -117,19 +117,19 @@ You may be prompted for the same username and password twice. .Validate your Docker Compose file [source, console] ---- -docker-compose config -q +docker compose config -q ---- .Start the service in background [source, console] ---- -docker-compose up -d +docker compose up -d ---- .Verify the connectivity and the configuration with the health check [source, console] ---- -docker-compose exec minion bin/client opennms:health-check +docker compose exec minion bin/client opennms:health-check ---- .The endpoints should be reachable and the bundles should be installed successful diff --git a/docs/modules/deployment/pages/minion/docker/secure-karaf.adoc b/docs/modules/deployment/pages/minion/docker/secure-karaf.adoc index 52d01d306a04..3b682e4e1718 100644 --- a/docs/modules/deployment/pages/minion/docker/secure-karaf.adoc +++ b/docs/modules/deployment/pages/minion/docker/secure-karaf.adoc @@ -53,5 +53,5 @@ volumes: .Restart the Minion container [source, console] ---- -docker-compose restart minion +docker compose restart minion ---- diff --git a/docs/modules/reference/pages/configuration/minion-confd/test-confd.adoc b/docs/modules/reference/pages/configuration/minion-confd/test-confd.adoc index 2bd7a6f4b36b..4037d9b0aac5 100644 --- a/docs/modules/reference/pages/configuration/minion-confd/test-confd.adoc +++ b/docs/modules/reference/pages/configuration/minion-confd/test-confd.adoc @@ -9,9 +9,9 @@ The following procedure, which requires a Minion Docker container, might be usef . Download a Minion Docker image from a build in CircleCI. This can be found as an artifact of the `tarball-assembly` job. . Load the image into Docker: `docker load minion.oci`. -. Create a `docker-compose.yaml` file in the parent folder of the checked-out `opennms` repo. +. Create a `docker-compose.yml` file in the parent folder of the checked-out `opennms` repo. See below for a sample compose file. -. Start the image: `docker-compose up -d`. +. Start the image: `docker compose up -d`. . Open a shell in the container using `docker exec -ti minion bash` or look at the logs `docker logs minion`. . If the result is not satisfactory, remove the container (`docker rm -f minion`), edit the files in your IDE, and restart the image. diff --git a/opennms-container/minion/CONFD_README.md b/opennms-container/minion/CONFD_README.md index c0ec45d38b8a..1d478fd66413 100644 --- a/opennms-container/minion/CONFD_README.md +++ b/opennms-container/minion/CONFD_README.md @@ -230,8 +230,8 @@ process-env: 1. A Minion Docker image is required. It can be downloaded from a build in CircleCI. It is an artifact of the `tarball-assembly` job. 1. Load the image into Docker: `docker load minion.oci` -1. Create a `docker-compose.yaml` file in the parent folder of the checked out `opennms` repo. An example compose file is given below -1. Start the image: `docker-compose up -d` +1. Create a `docker-compose.yml` file in the parent folder of the checked out `opennms` repo. An example compose file is given below +1. Start the image: `docker compose up -d` 1. Open a shell in the container using `docker exec -ti minion bash` or look at the logs `docker logs minion` 1. If the result is not yet satisfactory then remove the container by `docker rm -f minion`, edit the files in your IDE, and start the image again