switch to compose v2

Author: crazy-max

README.md

@@ -227,11 +227,11 @@ Image: anonaddy/anonaddy:latest
 ### Docker Compose
 
 Docker compose is the recommended way to run this image. You can use the following
-[docker compose template](examples/compose/docker-compose.yml), then run the container:
+[docker compose template](examples/compose/compose.yml), then run the container:
 
 ```console
-docker-compose up -d
-docker-compose logs -f
+docker compose up -d
+docker compose logs -f
 ```
 
 ## Upgrade
@@ -240,8 +240,8 @@ You can upgrade AnonAddy automatically through the UI, it works well. But I
 recommend to recreate the container whenever I push an update:
 
 ```console
-docker-compose pull
-docker-compose up -d
+docker compose pull
+docker compose up -d
 ```
 
 ## Notes
@@ -252,25 +252,25 @@ If you want to use the artisan command to perform common server operations like
 manage users, passwords and more, type:
 
 ```console
-docker-compose exec anonaddy anonaddy <command>
+docker compose exec anonaddy anonaddy <command>
 ```
 
 For example to list all available commands:
 
 ```console
-docker-compose exec anonaddy anonaddy list
+docker compose exec anonaddy anonaddy list
 ```
 
 ### Create user
 
 ```console
-docker-compose exec anonaddy anonaddy anonaddy:create-user "username" "webmaster@example.com"
+docker compose exec anonaddy anonaddy anonaddy:create-user "username" "webmaster@example.com"
 ```
 
 ### Generate DKIM private/public keypair
 
 ```console
-docker-compose run --entrypoint '' anonaddy gen-dkim
+docker compose run --entrypoint '' anonaddy gen-dkim
 ```
 
 ```text
@@ -291,7 +291,7 @@ If you don't have an existing GPG key, you can generate a new GPG key with the
 following command:
 
 ```console
-docker-compose exec --user anonaddy anonaddy gpg --full-gen-key
+docker compose exec --user anonaddy anonaddy gpg --full-gen-key
 ```
 
 Keys will be stored in `/data/.gnupg` folder.

examples/compose/docker-compose.yml renamed to examples/compose/compose.yml

@@ -1,4 +1,4 @@
-version: "3.5"
+name: annoaddy
 
 services:
   db:

examples/nginx/README.md

@@ -15,8 +15,8 @@ sudo openssl dhparam -out dhparam.pem 4096
 
 ## Configure mounts for nginx
 
-The `docker-compose.yml` may need some adjusting to properly mount your
-specific let's encrypt and dhparam certs.
+The `compose.yml` may need some adjusting to properly mount your specific
+let's encrypt and dhparam certs.
 
 ## Rspamd web ui
 

examples/nginx/docker-compose.yml renamed to examples/nginx/compose.yml

@@ -1,4 +1,4 @@
-version: "3.5"
+name: annoaddy
 
 services:
   db:

examples/rspamd/docker-compose.yml renamed to examples/rspamd/compose.yml

@@ -1,4 +1,4 @@
-version: "3.5"
+name: annoaddy
 
 services:
   db:

examples/traefik/README.md

@@ -3,6 +3,6 @@
 ```bash
 touch acme.json
 chmod 600 acme.json
-docker-compose up -d
-docker-compose logs -f
+docker compose up -d
+docker compose logs -f
 ```

examples/traefik/docker-compose.yml renamed to examples/traefik/compose.yml

@@ -1,4 +1,4 @@
-version: "3.5"
+name: annoaddy
 
 services:
   traefik:

test/compose.yml

@@ -1,3 +1,5 @@
+name: annoaddy
+
 services:
   db:
     image: mariadb:10.5