Skip to content

[master] update Compose to v2.3.4#652

Merged
thaJeztah merged 1 commit intodocker:masterfrom
glours:bump-compose-2-3-4
Mar 26, 2022
Merged

[master] update Compose to v2.3.4#652
thaJeztah merged 1 commit intodocker:masterfrom
glours:bump-compose-2-3-4

Conversation

@glours
Copy link
Contributor

@glours glours commented Mar 25, 2022

Signed-off-by: Guillaume Lours guillaume.lours@docker.com

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
@glours glours self-assigned this Mar 25, 2022
@glours glours requested a review from thaJeztah March 25, 2022 10:32
@thaJeztah
Copy link
Member

thaJeztah commented Mar 25, 2022

Hmmm.. does kubernetes now require CGO or something? Or are they no longer compatible with go1.16?

GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=v2.3.4"  -o /usr/libexec/docker/cli-plugins/docker-compose ./cmd
# sigs.k8s.io/json/internal/golang/encoding/json
/go/pkg/mod/sigs.k8s.io/json@v0.0.0-20211020170558-c049b76a60c6/internal/golang/encoding/json/encode.go:1249:12: sf.IsExported undefined (type reflect.StructField has no field or method IsExported)
/go/pkg/mod/sigs.k8s.io/json@v0.0.0-20211020170558-c049b76a60c6/internal/golang/encoding/json/encode.go:1255:18: sf.IsExported undefined (type reflect.StructField has no field or method IsExported)

@thaJeztah
Copy link
Member

CGO, not JSON (lol.. in two chats at the same time) 😂

@thaJeztah
Copy link
Member

thaJeztah commented Mar 25, 2022

Guessing this could be related; looks like they copy Golang's code into their own repository; kubernetes-sigs/json@80fe866

Dependency was added as part of docker/compose#9254 (not 100% sure where buildx requires/uses kubernetes in the client side) @crazy-max probably knows

@thaJeztah
Copy link
Member

So that depends on Go 1.17 indeed, which introduced the IsExported() function; golang/go@b83d073

@crazy-max
Copy link
Member

crazy-max commented Mar 25, 2022

As discussed with @thaJeztah you should have the same replaces in compose: https://github.com/docker/buildx/blob/1ca30a58c2f25a7f72a2fdb5d62e82bf1e2fa37c/go.mod#L62-L64. See also docker/buildx#948

@thaJeztah
Copy link
Member

Opened docker/compose#9317 to pin the dependencies (but will need a new release after that)

@thaJeztah thaJeztah changed the title update Compose to v2.3.4 [master] update Compose to v2.3.4 Mar 26, 2022
@thaJeztah
Copy link
Member

We updated master to go1.17, and I kicked CI for this PR

If we want to ship an updated version of compose before docker 22.xx is released, we need to have docker/compose#9317 merged and a new version of compose

(this PR on master we can merge if CI goes green)

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 6168fab into docker:master Mar 26, 2022
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