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

Convert docker-compose to docker compose #2341

Merged
merged 8 commits into from
Jan 25, 2024
Merged

Convert docker-compose to docker compose #2341

merged 8 commits into from
Jan 25, 2024

Conversation

originalsouth
Copy link
Contributor

Changes

Convert all instances of docker-compose to docker compose.

Issue link

Initial fix for #2336 (still experiencing race conditions)

Demo

Conversion script

#!/usr/bin/env zsh

# Patch scripts without touching files or variables
for potato in $(rg -l "docker-compose")
do
    sed -i 's/docker-compose -\([a-z]\)/docker compose -\1/g' $potato
    sed -i 's/docker-compose \([a-z]*[a-z]\)/docker compose \1/g' $potato
done

# Probably we do not want to touch release notes
git checkout docs/source/release_notes/1.8.rst

rg can be found here.


Code Checklist

  • All the commits in this PR are properly PGP-signed and verified;
  • This PR only contains functionality relevant to the issue; tickets have been created for newly discovered issues.
  • I have written unit tests for the changes or fixes I made.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have performed a self-review of my code and refactored it to the best of my abilities.

Communication

  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have made corresponding changes to the documentation, if necessary.

Checklist for code reviewers:

Copy-paste the checklist from the docs/source/templates folder into your comment.


Checklist for QA:

Copy-paste the checklist from the docs/source/templates folder into your comment.

@originalsouth originalsouth requested a review from a team as a code owner January 17, 2024 08:07
@originalsouth originalsouth changed the title Covert docker-compose to docker compose Convert docker-compose to docker compose Jan 17, 2024
@originalsouth
Copy link
Contributor Author

Well, at least the failure is consistent now with my observations at home...

...
 ------------------------------------------------------------------------------
Robot.07 Bit Configs                                                  | PASS |
2 tests, 2 passed, 0 failed
==============================================================================
Robot.07 Rerun Bits                                                           
==============================================================================
Rerun bits                                                            | FAIL |
2 != 3
------------------------------------------------------------------------------
Robot.07 Rerun Bits                                                   | FAIL |
1 test, 0 passed, 1 failed
==============================================================================
Robot.08 Findings                                                             
==============================================================================
List Findings                                                         | PASS |
------------------------------------------------------------------------------
Robot.08 Findings                                                     | PASS |
1 test, 1 passed, 0 failed
==============================================================================
Robot                                                                 | FAIL |
15 tests, 14 passed, 1 failed
==============================================================================
...

Snip from here.

@originalsouth originalsouth self-assigned this Jan 17, 2024
@originalsouth originalsouth marked this pull request as draft January 17, 2024 08:15
ammar92
ammar92 previously approved these changes Jan 17, 2024
Copy link
Contributor

@ammar92 ammar92 left a comment

Choose a reason for hiding this comment

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

Probably not the solution for the root problem, but definitely the recommended approach for current and newer Docker installations

@originalsouth originalsouth marked this pull request as ready for review January 24, 2024 07:32
@originalsouth
Copy link
Contributor Author

@ammar92 @dekkers @underdarknl do we also want to update the github pipelines (docker-compose to docker compose)?

@dekkers
Copy link
Contributor

dekkers commented Jan 24, 2024

@ammar92 @dekkers @underdarknl do we also want to update the github pipelines (docker-compose to docker compose)?

Yes, those should also be updated.

@originalsouth originalsouth marked this pull request as draft January 24, 2024 10:17
@originalsouth originalsouth marked this pull request as ready for review January 24, 2024 10:26
@originalsouth
Copy link
Contributor Author

Yes, those should also be updated.

Done

@ammar92 ammar92 merged commit 0b4e04e into main Jan 25, 2024
52 checks passed
@ammar92 ammar92 deleted the fix/2336 branch January 25, 2024 09:32
jpbruinsslot added a commit that referenced this pull request Jan 29, 2024
* main:
  Fix/394 Introduce clearance level control for objects imported by CSV (#2390)
  Update RabbitMQ to the latest version (#2392)
  Show created at and data from in reports (#2370)
  Rename invalid rpki finding to expired (#2377)
  Convert `docker-compose` to `docker compose` (#2341)
  Remove uWSGI (#2366)
  Prevent double github actions (#2374)
jpbruinsslot added a commit that referenced this pull request Jan 29, 2024
* main:
  Fix/394 Introduce clearance level control for objects imported by CSV (#2390)
  Update RabbitMQ to the latest version (#2392)
  Show created at and data from in reports (#2370)
  Rename invalid rpki finding to expired (#2377)
  Convert `docker-compose` to `docker compose` (#2341)
  Remove uWSGI (#2366)
  Prevent double github actions (#2374)
  Fix WEASYPRINT_BASEURL default value and change ports in docker-compose.yml (#2373)
  Remove debian11 packages (#2358)
  Error handling for Generate Report (#2274)
  Update dependencies (#2348)
  Add token authentication (#2349)
  Adds CAA records to the model, boefje, normalizer, adds a check bit and a finding (#2315)
  Check for sudo in install and update script (#2360)
  Feat/normalizer mimetype upload deeplink (#2220)
  Add hrefs to Basic Security overview (#2330)
  Render dicts and list ooi attrs as jsonfield (#2355)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants