fix: use docker compose rather than docker-compose (#3815)

ory · Aug 6, 2024 · ffdfb73 · ffdfb73
1 parent d0e047c
commit ffdfb73
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/internal/certification/scripts/install.sh b/internal/certification/scripts/install.sh
@@ -36,14 +36,13 @@ sudo add-apt-repository \
    $(lsb_release -cs) \
    stable"
 sudo apt-get update
-sudo apt-get -y install docker-ce python-pip
+sudo apt-get -y install docker-ce
 
 # Dockerize
 export DOCKERIZE_VERSION=v0.6.1
 wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-sudo pip install docker-compose
 
 git clone https://github.com/ory/hydra-login-consent-node.git
 

diff --git a/scripts/5min-tutorial.sh b/scripts/5min-tutorial.sh
@@ -4,7 +4,7 @@ DB=${DB:-postgres}
 TRACING=${TRACING:-false}
 PROMETHEUS=${PROMETHEUS:-false}
 
-DC="docker-compose -f quickstart.yml"
+DC="docker compose -f quickstart.yml"
 if [[ $DB == "mysql" ]]; then
     DC+=" -f quickstart-mysql.yml"
 fi
@@ -20,4 +20,3 @@ fi
 DC+=" up --build"
 
 $DC
-
diff --git a/test/conformance/purge.sh b/test/conformance/purge.sh
@@ -3,4 +3,4 @@
 set -euxo pipefail
 cd "$( dirname "${BASH_SOURCE[0]}" )/../.."
 
-docker-compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml down -v
+docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml down -v
diff --git a/test/conformance/start.sh b/test/conformance/start.sh
@@ -4,4 +4,4 @@ set -euxo pipefail
 cd "$( dirname "${BASH_SOURCE[0]}" )/../.."
 
 # shellcheck disable=SC2086
-docker-compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build
+docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build