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

build: bump docker-compose to v2.25.0 #5939

Merged
merged 3 commits into from Mar 18, 2024
Merged

Conversation

rfay
Copy link
Member

@rfay rfay commented Mar 6, 2024

The Issue

docker-compose v2.25.0 was released. Run tests on it.

@github-actions github-actions bot added dependencies Pull requests that update a dependency file maintenance labels Mar 6, 2024
Copy link

github-actions bot commented Mar 6, 2024

@rfay
Copy link
Member Author

rfay commented Mar 6, 2024

Wow, completely 100% failed!

@rfay
Copy link
Member Author

rfay commented Mar 7, 2024

It seems that the router is broken and is sending the request elsewhere? Maybe some labels are messed up or something.

  • Using the 127.0.0.1 URL provided by ddev start works fine
  • docker exec -it ddev-router bash and curl http://ddev-d10-web works fine
  • Watching logs from docker logs -f ddev-router when doing curl https://d10.ddev.site gets a 404 and
172.24.0.1 - - [07/Mar/2024:00:47:21 +0000] "GET / HTTP/2.0" 404 19 "-" "-" 139 "-" "-" 0ms

I think the router is probably trying to hit itself?

With v1.22.7 I get
172.29.0.1 - - [07/Mar/2024:01:04:12 +0000] "GET / HTTP/2.0" 200 36377 "-" "-" 4 "d10-web-80-https@file" "http://ddev-d10-web:80" 297ms

@rfay
Copy link
Member Author

rfay commented Mar 7, 2024

It works fine with docker-compose v2.24.6. ddev config global --required-docker-compose-version=v2.24.6

But nothing at all works with 2.24.7.

Unless it's the networks change in https://github.com/docker/compose/releases/tag/v2.24.7 I don't know what it would be. git bisect may be the path to study it (of compose). Or just wait for issues to show up in their queue?

@stasadev
Copy link
Member

stasadev commented Mar 7, 2024

I tested commits for v2.24.7 docker-compose release.

The bug is somewhere in:

@rfay
Copy link
Member Author

rfay commented Mar 7, 2024

Thanks for the research!

I think it's actually breaking something about ddev-router/traefik usage.

@stasadev
Copy link
Member

stasadev commented Mar 7, 2024

Or just wait for issues to show up in their queue?

Yes, found a bug report for this exact problem 😅:

@stasadev
Copy link
Member

stasadev commented Mar 7, 2024

I think it's actually breaking something about ddev-router/traefik usage.

Compared the contents of ~/.ddev/.router-compose-full.yaml:

v2.24.5:

networks:
  ddev_default:
    external: true
    name: ddev_default

v2.24.7

networks:
  ddev_default:
    external: true
    name: ddev_default
  default:
    name: ddev-d10_default

and when you start another project:

networks:
  ddev_default:
    external: true
    name: ddev_default
  default:
    name: ddev-project_default

@rfay
Copy link
Member Author

rfay commented Mar 7, 2024

Thanks for the great chasing @stasadev

Closing this one for now, we'll watch

@rfay rfay closed this Mar 7, 2024
@stasadev
Copy link
Member

Reopening with rebase and trying to fix our code for docker-compose v2.24.7

@stasadev
Copy link
Member

There is still a bug with the default network, which is created when we are not asked to do so, but this should not prevent the code from running:

@stasadev
Copy link
Member

It still doesn't work because I made changes in only one place, the fix for the output should be made in:

func fixupComposeYaml(yamlStr string, app *DdevApp) (map[string]interface{}, error) {

@stasadev stasadev changed the title build: bump docker-compose to v2.24.7 build: bump docker-compose to v2.25.0 Mar 15, 2024
@rfay rfay marked this pull request as ready for review March 16, 2024 17:40
@rfay rfay requested a review from a team as a code owner March 16, 2024 17:40
@rfay
Copy link
Member Author

rfay commented Mar 16, 2024

I guess we should go ahead and go with this? Or should we try to adopt their new format at this time?

@rfay rfay requested a review from stasadev March 16, 2024 17:40
Copy link
Member

@stasadev stasadev left a comment

Choose a reason for hiding this comment

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

I think we should update docker-compose to v2.25.0.

@rfay rfay merged commit bc8cb6a into ddev:master Mar 18, 2024
23 checks passed
@rfay rfay deleted the 20240306_compose_2.24.7 branch March 18, 2024 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants