From 6f34dee51534efc8fcd8633b2964b83bafdc5619 Mon Sep 17 00:00:00 2001 From: Jonas Vinther Date: Mon, 16 Dec 2024 12:22:16 +0100 Subject: [PATCH] Support docker compose v2 (#172) --- .github/workflows/go.yml | 2 +- scripts/start-vault.sh | 2 +- scripts/stop-vault.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 8a01fbd..763f485 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -30,7 +30,7 @@ jobs: fi - name: Start Vault container - run: docker-compose -f scripts/docker-compose.yml up -d + run: docker compose -f scripts/docker-compose.yml up -d env: VAULT_TOKEN: my-root-token VAULT_VOLUME: /tmp/vault/data/vault-volume diff --git a/scripts/start-vault.sh b/scripts/start-vault.sh index 163ad06..7c57f1d 100755 --- a/scripts/start-vault.sh +++ b/scripts/start-vault.sh @@ -37,7 +37,7 @@ docker run -d -u root -v $VAULT_VOLUME:/tmp/vault:rw alpine:latest chown -R 100: # Start the Vault container (cd $SCRIPT_SOURCE -docker-compose -f docker-compose-tls.yml up -d) +docker compose -f docker-compose-tls.yml up -d) # Wait for Vault to startup sleep 5 diff --git a/scripts/stop-vault.sh b/scripts/stop-vault.sh index 41ad741..dcf900d 100755 --- a/scripts/stop-vault.sh +++ b/scripts/stop-vault.sh @@ -4,4 +4,4 @@ echo "Stopping Vault container" export SCRIPT_SOURCE=$(dirname "${BASH_SOURCE[0]}") (cd $SCRIPT_SOURCE -docker-compose -f docker-compose-tls.yml down) +docker compose -f docker-compose-tls.yml down)