upgrade docker

.github/workflows/lights-test.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Run containers
         run: |
           sudo chown -R 1000:1000 data/nodered
-          docker-compose --env-file example.env up --build --force-recreate -d
+          docker compose --env-file example.env up --build --force-recreate -d
 
       - name: Setup node
         uses: actions/setup-node@v3.5.1
@@ -23,10 +23,10 @@ jobs:
 
       - name: Run tests
         run: |
-          docker-compose --env-file example.env ps
+          docker compose --env-file example.env ps
           cd docker/test
           npm ci
           sleep 30
           docker ps
-          docker-compose --env-file ../../example.env logs
+          docker compose --env-file ../../example.env logs
           npm start

README.md

@@ -13,14 +13,14 @@ cd homy
 * Initialize the OPNVPN configuration files and certificates
 
 ```bash
-docker-compose run --rm openvpn ovpn_genconfig -Ddbu udp://VPN.SERVERNAME.COM
-docker-compose run --rm openvpn ovpn_initpki
+docker compose run --rm openvpn ovpn_genconfig -Ddbu udp://VPN.SERVERNAME.COM
+docker compose run --rm openvpn ovpn_initpki
 ```
 
 * Start the containers
 
 ```bash
-docker-compose up -d
+docker compose up -d
 ```
 
 * All is up and running
@@ -41,22 +41,22 @@ A good solution is available at [ufw-docker](https://github.com/chaifeng/ufw-doc
 ```bash
 export CLIENTNAME="your_client_name"
 # with a passphrase (recommended)
-docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME
+docker compose run --rm openvpn easyrsa build-client-full $CLIENTNAME
 # without a passphrase (not recommended)
-docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME nopass
+docker compose run --rm openvpn easyrsa build-client-full $CLIENTNAME nopass
 ```
 
 * Retrieve the client configuration with embedded certificates
 
 ```bash
-docker-compose run --rm openvpn ovpn_getclient $CLIENTNAME > $CLIENTNAME.ovpn
+docker compose run --rm openvpn ovpn_getclient $CLIENTNAME > $CLIENTNAME.ovpn
 ```
 
 * Revoke a client certificate
 
 ```bash
 # Keep the corresponding crt, key and req files.
-docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME
+docker compose run --rm openvpn ovpn_revokeclient $CLIENTNAME
 # Remove the corresponding crt, key and req files.
-docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME remove
+docker compose run --rm openvpn ovpn_revokeclient $CLIENTNAME remove
 ```

test/test_routing.sh

@@ -10,7 +10,7 @@ source ../example.env
 
 export DOMAIN=
 
-dc="docker-compose --env-file ../example.env -f ../docker-compose.yml"
+dc="docker compose --env-file ../example.env -f ../docker-compose.yml"
 
 sudo iptables-save > /tmp/iptables.backup
 

test_infrastructure.sh

@@ -8,7 +8,7 @@ TIMEOUT=3
 
 export DOMAIN=
 
-dc="docker-compose --env-file example.env"
+dc="docker compose --env-file example.env"
 dct="$dc --file docker-compose.yml --file docker-compose.test.yml"
 vpn="$dct run test-vpn"
 ext="$dct run test-external"