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

[PM-15413] fix: Restore docker-compose support and set docker compose as default #309

Open
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

vvolkgang
Copy link
Member

@vvolkgang vvolkgang commented Nov 22, 2024

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-15413

📔 Objective

Users reported their systems don't support docker compose yet but have updated versions of docker-compose. @keithhubner confirmed Compose Plugin can be used but that may not be an option for everyone. In this PR we bring back docker-compose, while setting docker compose as the default.

  1. Reverts Breaking change: remove support for deprecated docker-compose CLI #301
  2. Sets docker compose as default, falling back to docker-compose when the former isn't available

As an additional note, just happened to fresh install docker and docker-compose in a new machine through Homebrew, docker compose is only available after setting up the cli-plugins path as instructed.

Context:

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

Copy link
Contributor

github-actions bot commented Nov 22, 2024

Logo
Checkmarx One – Scan Summary & Detailsc01e7aa1-f9c1-4c76-a17f-1e2c9da77944

No New Or Fixed Issues Found

@vvolkgang vvolkgang changed the title Restore docker-compose support and set docker compose as default [PM-15413] Restore docker-compose support and set docker compose as default Nov 26, 2024
@vvolkgang vvolkgang marked this pull request as ready for review November 26, 2024 20:26
@vvolkgang vvolkgang requested a review from a team as a code owner November 26, 2024 20:26
@vvolkgang vvolkgang changed the title [PM-15413] Restore docker-compose support and set docker compose as default [PM-15413] fix: Restore docker-compose support and set docker compose as default Nov 27, 2024
@vvolkgang vvolkgang enabled auto-merge (squash) November 27, 2024 16:52
@vvolkgang vvolkgang enabled auto-merge (squash) November 27, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants