From 0a71106ec24229357b33bbfe72fcebcf0063f2ff Mon Sep 17 00:00:00 2001 From: Josh Watzman Date: Fri, 30 Aug 2024 11:37:17 +0100 Subject: [PATCH] Change "docker-compose" to "docker compose" Per discussion on Discord, the existing syntax is apparently deprecated, and should be replaced with this. --- ops/local-dev.sh | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ops/local-dev.sh b/ops/local-dev.sh index 97e4f35d4..0c7413017 100755 --- a/ops/local-dev.sh +++ b/ops/local-dev.sh @@ -18,7 +18,7 @@ cat localhost/localhost.key localhost/localhost.crt > localhost/localhost.packed # Start up service dependencies cd ops - docker-compose up -d + docker compose up -d echo "Waiting for dependencies to start..." while ! pg_isready -U "$POSTGRES_USER" -h localhost -p "$POSTGRES_PORT" -q ; do diff --git a/package.json b/package.json index 6626facf8..810f366a3 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "db-ssh-tunnel": "lsof -i '@localhost:15432' >/dev/null || ssh -f -N -L 15432:database-prod-read.int.cord.com:5432 zero", "db-ssh-tunnel-write": "lsof -i '@localhost:25432' >/dev/null || ssh -f -N -L 25432:database-prod.int.cord.com:5432 zero", "start-external-dev": "http-server ./dist/external -c-1 -a :: --silent --port 8179 --cors --ssl --key ./localhost/localhost.key --cert ./localhost/localhost.crt", - "start-local-s3": "cat ./localhost/localhost.key ./localhost/localhost.crt > ./localhost/localhost.packed && cd ops && docker-compose up localstack", - "start-postgres": ". ./.env && export POSTGRES_USER POSTGRES_DB POSTGRES_PORT POSTGRES_PASSWORD && cd ops && docker-compose up postgres", - "start-redis": "cd ops && docker-compose up redis", + "start-local-s3": "cat ./localhost/localhost.key ./localhost/localhost.crt > ./localhost/localhost.packed && cd ops && docker compose up localstack", + "start-postgres": ". ./.env && export POSTGRES_USER POSTGRES_DB POSTGRES_PORT POSTGRES_PASSWORD && cd ops && docker compose up postgres", + "start-redis": "cd ops && docker compose up redis", "start-server-dev": "NODE_EXTRA_CA_CERTS=\"$(mkcert -CAROOT)/rootCA.pem\" node -r dotenv/config --enable-source-maps ./dist/server/index.js", "start-server-dev-snapshots": "NODE_EXTRA_CA_CERTS=\"$(mkcert -CAROOT)/rootCA.pem\" node -r dotenv/config --enable-source-maps --heapsnapshot-signal=SIGUSR2 ./dist/server/index.js", "start-server-prod": "node -r dotenv/config dist/generic/server/index.js", @@ -37,7 +37,7 @@ "start-docs-server-prod": "node -r dotenv/config dist/generic/docs/server/index.js", "tsc": "tsc --incremental false --noEmit --skipLibCheck --watch --preserveWatchOutput", "tsc-once": "tsc --incremental false --noEmit --skipLibCheck", - "wipe-postgres": "cd ops && POSTGRES_USER= POSTGRES_DB= POSTGRES_PASSWORD= docker-compose down --volumes", + "wipe-postgres": "cd ops && POSTGRES_USER= POSTGRES_DB= POSTGRES_PASSWORD= docker compose down --volumes", "install": "find node_modules/@sentry/ -type f -print0 | grep -z -E '\\.(js|js\\.map|d\\.ts)$' | if sed --version >/dev/null 2>&1 ; then xargs -0 sed --in-place 's/\\b__SENTRY__\\b/_CORDSNTRY/g;'; else xargs -0 sed -i '' -E 's/[[:<:]]__SENTRY__[[:>:]]/_CORDSNTRY/g;'; fi", "postinstall": "patch-package", "repl": "./build/index.mjs --mode=development --target=repl && node ./dist/repl/index.js",