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.

Sign up for GitHub

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

Jump to bottom

Remove Docker Compose: "version" #2718

Merged
merged 8 commits into from
Mar 27, 2024
Merged

Remove Docker Compose: "version" #2718

merged 8 commits into from
Mar 27, 2024

Conversation

originalsouth
Copy link
Contributor

@originalsouth originalsouth commented Mar 26, 2024 •
edited
Loading

Changes

Remove Docker Compose: "version"
docker/compose#11628

Issue link

This is a trivial patch without an issue, making an issue would be superfluous be a superfluous burden for everybody involved.

Demo

N/A

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.
  • I have included comments in the code to elaborate on what is not self-evident from the code itself, including references to issues and discussions online, or implicit behavior of an interface.

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 force-pushed the fix/docker-compose_version_is_obsolete branch 2 times, most recently from 687299c to b25e002 Compare March 26, 2024 08:38
ammar92
ammar92 reviewed Mar 26, 2024
View reviewed changes
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.

I've noticed this too a few days ago. Perhaps also apply this on the other Docker Compose files in the codebase too? (e.g. in the .ci folders)

@originalsouth
Copy link
Contributor Author

I've noticed this too a few days ago. Perhaps also apply this on the other Docker Compose files in the codebase too? (e.g. in the .ci folders)

Yeah, I was doing that, but than the whole CI breaks (so far; I don't want to add all the bogus experiments to the history so I decided to overwrite them) -- hence drafting [WIP], I will throw it in the group "when it's done" ;)

@originalsouth
Copy link
Contributor Author

I guess we want to get rid of all the base files as they have no use anymore.

@originalsouth
Copy link
Contributor Author

originalsouth commented Mar 26, 2024 •
edited
Loading

Do we want to keep .ci/.ci/.env.test? It seems to be empty.

@originalsouth originalsouth marked this pull request as ready for review March 26, 2024 09:57
@originalsouth originalsouth requested a review from a team as a code owner March 26, 2024 09:57
@originalsouth
Copy link
Contributor Author

Ready for merge, removed all *base.yml and version statements.

This question remains, however (although not relevant to this patch per se):

Do we want to keep .ci/.ci/.env.test? It seems to be empty.

@ammar92
Copy link
Contributor

ammar92 commented Mar 26, 2024

Ready for merge, removed all *base.yml and version statements.

This question remains, however (although not relevant to this patch per se):

Do we want to keep .ci/.ci/.env.test? It seems to be empty.

If there are no references to it, then I suppose it can be removed

@originalsouth originalsouth marked this pull request as draft March 26, 2024 10:18
@originalsouth
Copy link
Contributor Author

Also added changes for the recipes of make -C octopoes itest and make -C octopoes rtest

@originalsouth originalsouth marked this pull request as ready for review March 26, 2024 10:59
@originalsouth
Copy link
Contributor Author

If there are no references to it, then I suppose it can be removed

Decided to keep it for possible future variables we have to include

@originalsouth originalsouth force-pushed the fix/docker-compose_version_is_obsolete branch 3 times, most recently from 78a4835 to e61267f Compare March 26, 2024 12:30
@originalsouth originalsouth force-pushed the fix/docker-compose_version_is_obsolete branch from e61267f to b27238f Compare March 26, 2024 12:36
ammar92
ammar92 approved these changes Mar 26, 2024
View reviewed changes
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.

Looks good to me 👍 If we somehow find a way later to avoid specifying --project-directory, that would be my preference

Donnype
Donnype reviewed Mar 26, 2024
View reviewed changes
bytes/Makefile
@@ -60,7 +60,7 @@ migrate: ## Run alembic migrations
##|------------------------------------------------------------------------|

test: utest itest ## Run all tests.
ci-docker-compose := docker compose -f base.yml -f .ci/docker-compose.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

By changing the paths in the compose file you can sometimes resolve this already even without the --project-directory 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure what you mean @Donnype, can you be more specific?

  • You want to change the path inside the compose file (tried that with context wasn't trivial to get to work...)?
  • You want to change the path of the compose file?
--project-directory string   Specify an alternate working directory
                             (default: the path of the, first specified, Compose file)

@dekkers dekkers merged commit c2a4270 into main Mar 27, 2024
38 checks passed
@dekkers dekkers deleted the fix/docker-compose_version_is_obsolete branch March 27, 2024 09:52
jpbruinsslot added a commit that referenced this pull request Apr 4, 2024
@jpbruinsslot
Merge branch 'main' into feature/mula/refactor-queue
652fc2c 
* main: (51 commits)
  Fix static files for container images/Debian packages when DEBUG is on (#2742)
  OOI selection at Aggregate report does not remember changed selection (#2619)
  fix schema errors on empty / missing schemas (#2744)
  Updated `phonenumbers` and `django-phonenumber-field` (#2757)
  Remove octopoes coverage workflow (#2755)
  Bump actions/configure-pages from 4 to 5 (#2745)
  Add xtdb-cli tool to Octopoes (#2733)
  Dont report vulnerabilities without version info of the software for snyk (#2730)
  Feature/boefjes to oci images (#2709)
  Query non-reference fields and subclass-specific fields through path queries (#2662)
  Fix in System Specific (#2732)
  Plugins overview in appendix not showing any plugins (#2694)
  Feat stepper design v2 (#2704)
  Undo project-directory in Rocky (#2734)
  Remove Docker Compose: "version" (#2718)
  Upgrade `pre-commit` hooks (#2729)
  Fix #1739 (#2705)
  Improve generate report (#2633)
  Fix critical vulnerability counter (#2712)
  Fix pdf alignment (#2674)
  ...
@originalsouth originalsouth restored the fix/docker-compose_version_is_obsolete branch July 29, 2024 14:07
@originalsouth originalsouth deleted the fix/docker-compose_version_is_obsolete branch July 29, 2024 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Donnype Donnype Donnype left review comments

@ammar92 ammar92 ammar92 approved these changes

@dekkers dekkers dekkers approved these changes

Assignees
No one assigned
Labels
tech-debt
Projects
KAT
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@originalsouth @ammar92 @dekkers @Donnype