Fixed docker compose issue in backup/restore

[montaniasystemab]

The docker-compose command was hard coded in backup and restore routines. Replaced with $dc variable instead

Legal Boilerplate

Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.

[BYK]

Why do you need this change? $dc is there for a reason (for v1 and v2 compatibility)

[montaniasystemab]

Without it I get this error when trying to run scripts/backup.sh or restore.sh:

scripts/_lib.sh: line 65: docker-compose: command not found
Error in scripts/_lib.sh:65.
'docker-compose run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export /sentry-data/backup/backup.json' exited with status 127
-> ./scripts/backup.sh:main:4
--> scripts/_lib.sh:backup:65

rickard@craig ~/sentry ((23.4.0))> docker compose version
Docker Compose version v2.17.3
rickard@craig ~/sentry ((23.4.0))> docker --version
Docker version 23.0.5, build bc4487a

[BYK]

Oh wait I misread your PR. Yes it should have been $dc. My apologies 🤦🏻‍♂️

[BYK]

@hubertdeng123 I thought you used this script in CI, how did it pass without this PR?

[hubertdeng123]

thanks for submitting this!

[hubertdeng123]

I do use the script in CI as part of our integration tests 🤔, maybe both docker-compose and docker compose are accepted? Investigating...

[hubertdeng123]

Yeah, that's what's happening in CI as I opened a test PR. Both docker-compose and docker compose are accepted. Well, this won't happen form much longer once v1 is 🪓

[BYK]

@hubertdeng123 I recommend duplicating this line to have a fixed path for docker-compose:

self-hosted/.github/workflows/test.yml

Line 67 in 9f191ab

sudo rm -f "${{ matrix.compose_path }}/docker-compose"

So we know it won't exist at all?

[hubertdeng123]

Ok I did some more digging, it looks like in CI docker compose v1.29 is installed at /usr/local/bin/docker-compose. So docker-compose will use v1.29 and docker compose will use v2.

[hubertdeng123]

PR up: #2114