Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/modules/deployment/pages/core/docker/core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
8 changes: 4 additions & 4 deletions docs/modules/deployment/pages/core/docker/initialize.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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`

4 changes: 2 additions & 2 deletions docs/modules/deployment/pages/core/docker/postgresql.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/modules/deployment/pages/minion/docker/minion.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ volumes:
.Restart the Minion container
[source, console]
----
docker-compose restart minion
docker compose restart minion
----
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions opennms-container/minion/CONFD_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading