Skip to content

Commit ffdfb73

Browse files
authored
fix: use docker compose rather than docker-compose (#3815)
1 parent d0e047c commit ffdfb73

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

internal/certification/scripts/install.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ sudo add-apt-repository \
3636
$(lsb_release -cs) \
3737
stable"
3838
sudo apt-get update
39-
sudo apt-get -y install docker-ce python-pip
39+
sudo apt-get -y install docker-ce
4040

4141
# Dockerize
4242
export DOCKERIZE_VERSION=v0.6.1
4343
wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
4444
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
4545
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
46-
sudo pip install docker-compose
4746

4847
git clone https://github.com/ory/hydra-login-consent-node.git
4948

scripts/5min-tutorial.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DB=${DB:-postgres}
44
TRACING=${TRACING:-false}
55
PROMETHEUS=${PROMETHEUS:-false}
66

7-
DC="docker-compose -f quickstart.yml"
7+
DC="docker compose -f quickstart.yml"
88
if [[ $DB == "mysql" ]]; then
99
DC+=" -f quickstart-mysql.yml"
1010
fi
@@ -20,4 +20,3 @@ fi
2020
DC+=" up --build"
2121

2222
$DC
23-

test/conformance/purge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -euxo pipefail
44
cd "$( dirname "${BASH_SOURCE[0]}" )/../.."
55

6-
docker-compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml down -v
6+
docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml down -v

test/conformance/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -euxo pipefail
44
cd "$( dirname "${BASH_SOURCE[0]}" )/../.."
55

66
# shellcheck disable=SC2086
7-
docker-compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build
7+
docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build

0 commit comments

Comments
 (0)