diff options
Diffstat (limited to '')
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docker-compose.override.yml | 2 | ||||
| -rwxr-xr-x | test/host/test.sh | 12 | ||||
| -rwxr-xr-x | test/linuxserver/test.sh | 10 |
4 files changed, 13 insertions, 13 deletions
@@ -15,7 +15,7 @@ Usage Copy the [docker-compose.yml] file and run - WG_IFACE=wg0 docker-compose up -d + WG_IFACE=wg0 docker compose up -d Replace `WG_IFACE` with your interface name (or omit it to use wg0). diff --git a/docker-compose.override.yml b/docker-compose.override.yml index ed9fa83..604f4bc 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,5 +1,5 @@ # I want docker-compose.yml to be copyable; and if the build settings are -# present, and somebody copies it and runs docker-compose up -d, it will +# present, and somebody copies it and runs `docker compose up -d`, it will # complain that it can't build the image (which it stupid IMO). services: web: diff --git a/test/host/test.sh b/test/host/test.sh index 33de0ec..f23031f 100755 --- a/test/host/test.sh +++ b/test/host/test.sh @@ -101,17 +101,17 @@ build_services() { echo ------------------------------------------------------------------ echo Pull third-party images echo ------------------------------------------------------------------ - docker-compose pull api + docker compose pull api echo ------------------------------------------------------------------ echo Build wg-api-web echo ------------------------------------------------------------------ - docker-compose build --force-rm --progress plain --pull web + docker compose build --force-rm --progress plain --pull web echo ------------------------------------------------------------------ - echo docker-compose up + echo docker compose up echo ------------------------------------------------------------------ - WG_IFACE=server docker-compose up -d + WG_IFACE=server docker compose up -d } cleanup() { @@ -132,10 +132,10 @@ cleanup() { rm -rf -- "$base_dir" echo 'Showing the latest container logs...' - docker-compose logs --tail 25 + docker compose logs --tail 25 echo "Bringing down containers..." - docker-compose down -v --remove-orphans + docker compose down -v --remove-orphans } main() { diff --git a/test/linuxserver/test.sh b/test/linuxserver/test.sh index 220d215..ec65495 100755 --- a/test/linuxserver/test.sh +++ b/test/linuxserver/test.sh @@ -17,14 +17,14 @@ fix_permissions() { } docker_build() { - docker-compose build --force-rm --progress plain --pull "$@" + docker compose build --force-rm --progress plain --pull "$@" } build_services() { echo ------------------------------------------------------------------ echo Pull third-party images echo ------------------------------------------------------------------ - docker-compose pull wg api + docker compose pull wg api echo ------------------------------------------------------------------ echo Build wg-api-web @@ -37,9 +37,9 @@ build_services() { docker_build peer1 echo ------------------------------------------------------------------ - echo docker-compose up + echo docker compose up echo ------------------------------------------------------------------ - docker-compose up -d + docker compose up -d sleep 5 } @@ -55,7 +55,7 @@ cleanup() { echo ------------------------------------------------------------------ echo Cleaning up echo ------------------------------------------------------------------ - docker-compose down -v --remove-orphans + docker compose down -v --remove-orphans fix_permissions } |