Skip to content

Commit

Permalink
Replace docker-compose with docker compose in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
johannaengland committed Aug 6, 2024
1 parent 9aa2948 commit 236c7e4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/hacking/snmp-tunnels.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Course of action - with docker
==============================

1. Copy the content of :file:`docker-compose.snmp.yml` into
:file:`docker-compose.override.yml` or later run docker-compose like this:
:file:`docker-compose.override.yml` or later run docker compose like this:
``docker compose -f docker-compose.yml -f docker-compose.snmp.yml up``.

2. Change the line ``command: 192.168.0.1 user@my-hop-host 10000`` to the ip
Expand Down Expand Up @@ -61,7 +61,7 @@ When starting docker:
When adding IP device in SeedDB:

- if an error message appears go into the docker container using
``docker-compose exec nav /bin/bash`` and do ``ping mydevice.mydomain``. If that
``docker compose exec nav /bin/bash`` and do ``ping mydevice.mydomain``. If that
works, then make sure you're using the right management profile, because
tunneling works.

Expand Down
4 changes: 2 additions & 2 deletions doc/hacking/using-docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Docker is a lightweight "virtualization" framework for creating isolated
environments, useful both in development and production.
For more information on Docker visit their homepage_ or read the documentation_.

Installing Docker and docker-compose
Installing Docker and docker compose
------------------------------------

Docker provides up-to-date documentation on how to install it for most popular
Expand Down Expand Up @@ -202,7 +202,7 @@ The ``nav`` and ``web`` containers share a common configuration volume named
``nav_config``. This volume should persist even between rebuilds of the
containers themselves. If you want NAV to install a completely new set of
config files from scratch, you may need to manually trash this volume using the
``-v`` option to the :kbd:`docker-compose down` command.
``-v`` option to the :kbd:`docker compose down` command.


Overriding the compose services
Expand Down

0 comments on commit 236c7e4

Please sign in to comment.