Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uninstall Docker Compose v1 from CI so it's not used for tests #2114

Merged
merged 5 commits into from
May 2, 2023

Conversation

hubertdeng123
Copy link
Member

@hubertdeng123 hubertdeng123 commented Apr 28, 2023

This will uninstall docker compose v1.29 from CI so docker-compose cannot be used.

CI runs to indicate this is the case:

  1. https://github.com/getsentry/self-hosted/actions/runs/4832862658/jobs/8612163711?pr=2114
  2. https://github.com/getsentry/self-hosted/actions/runs/4832862658/jobs/8612163856?pr=2114

@hubertdeng123 hubertdeng123 force-pushed the hubertdeng123/test-docker-compose branch 2 times, most recently from 56cc302 to 1633845 Compare April 28, 2023 16:46
@hubertdeng123 hubertdeng123 changed the title Don't merge: test docker-compose in v2 Uninstall Docker Compose v1 from CI so it's not used for tests Apr 28, 2023
@hubertdeng123 hubertdeng123 marked this pull request as ready for review April 28, 2023 16:46
@hubertdeng123 hubertdeng123 force-pushed the hubertdeng123/test-docker-compose branch from b598c1a to c9eeeb2 Compare April 28, 2023 17:19
@hubertdeng123 hubertdeng123 force-pushed the hubertdeng123/test-docker-compose branch from a9c1fc7 to 9f09714 Compare April 28, 2023 19:04
@@ -11,24 +11,24 @@ echo "Creating backup..."
touch $(pwd)/sentry/backup.json
chmod 666 $(pwd)/sentry/backup.json
# Command here matches exactly what we have in our docs https://develop.sentry.dev/self-hosted/backup/#backup
docker-compose run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export /sentry-data/backup/backup.json
$dc run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export /sentry-data/backup/backup.json
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using $dc since our scripts do some pre-script setup that is failing CI (error-handling, dc-detect-version, detect-platform, trap)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yisss, exactly the cases we wanted to fix.

Comment on lines 71 to 72
# Docker Compose v1 is installed here, remove it
sudo rm -f "/usr/local/bin/docker-compose"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's move this up, next to other rm commands.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be after downloading docker-compose, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't really matter. I'd do it before to be consistent and not accidentally delete the downloaded one.

@@ -11,24 +11,24 @@ echo "Creating backup..."
touch $(pwd)/sentry/backup.json
chmod 666 $(pwd)/sentry/backup.json
# Command here matches exactly what we have in our docs https://develop.sentry.dev/self-hosted/backup/#backup
docker-compose run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export /sentry-data/backup/backup.json
$dc run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export /sentry-data/backup/backup.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yisss, exactly the cases we wanted to fix.

@hubertdeng123 hubertdeng123 merged commit 723abc0 into master May 2, 2023
8 checks passed
@hubertdeng123 hubertdeng123 deleted the hubertdeng123/test-docker-compose branch May 2, 2023 22:12
@github-actions github-actions bot locked and limited conversation to collaborators May 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants