Uh oh!
There was an error while loading. Please reload this page.
Move "labels" to compose 3.3 format - #32
Merged
Merged
Conversation
This was referenced May 6, 2017
ColinHebert
commented
May 6, 2017
| @@ -0,0 +1,475 @@ | |||
| { | |||
| "$schema": "http://json-schema.org/draft-04/schema#", | |||
| "id": "config_schema_v3.2.json", | |||
ContributorAuthor
There was a problem hiding this comment.
Please note that this PR is the strict equivalent of what was original proposed. This line is wrong and would have been fixed with moby/moby#32743
vdemeester
suggested changes
May 9, 2017
vdemeester
left a comment
Collaborator
There was a problem hiding this comment.
@ColinHebert can you rebase ? 👼 🙏
| @@ -0,0 +1,475 @@ | |||
| { | |||
| "$schema": "http://json-schema.org/draft-04/schema#", | |||
| "id": "config_schema_v3.2.json", | |||
ColinHebert
commented
May 9, 2017
ContributorAuthor
@vdemeester done. Given that the image used for dev is now different that the image that we used to have (the one in moby/moby) the content is slightly different (but still valid). |
vdemeester
approved these changes
May 9, 2017
vdemeester
left a comment
Collaborator
There was a problem hiding this comment.
LGTM 🐯
/cc @dnephin@thaJeztah
dnephin
reviewed
May 10, 2017
dnephin
left a comment
Contributor
There was a problem hiding this comment.
LGTM
Sorry needs a rebase after I merged the CI check for this file. I think the bindata change may be only the v3.2 line now.
ColinHebert
commented
May 10, 2017
ContributorAuthor
Errr, why are there so many rebases necessary, is it expected that the history of the project is being rewritten multiple times? |
Commit bb5dfdb added a labels option to the docker-compose file format, but added it to the 3.2 schema. This patch moves the change to the 3.3 schema Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
mlaventure
commented
May 11, 2017
Contributor
@ColinHebert no, the history is not rewritten, but other PRs being merge can cause conflicts with currently open one :) |
thaJeztah pushed a commit
to thaJeztah/cli
that referenced
this pull request
Jun 29, 2018
…estrator [18.03-ee] backport Fix broken swarm commands with Kubernetes defined as orchestrator
thaJeztah added a commit
to thaJeztah/cli
that referenced
this pull request
Mar 26, 2022
pkcs11 cannot be compiled statically if CGO is enabled (and glibc is used) see https://github.com/docker/cli/blob/3897c3fa544f1239c2bc2c3af2adcebcb3650c4d/vendor/github.com/miekg/pkcs11/pkcs11.go#L75 see docker#3490 (comment) When trying to do otherwise, warnings are printed (and shouldn't be ignored, similar to the `osusergo` build-tag): docker#32 [linux/amd64->s390x build 2/2] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount=type=tmpfs,target=cli/winresources xx-go --wrap && TARGET=/out ./scripts/build/binary && xx-verify $([ "static" = "static" ] && echo "--static") /out/docker docker#32 467.0 # github.com/docker/cli/cmd/docker docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000018.o: in function `New': docker#32 467.0 /go/src/github.com/docker/cli/vendor/github.com/miekg/pkcs11/pkcs11.go:75: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000004.o: in function `_cgo_26061493d47f_C2func_getaddrinfo': docker#32 467.0 /tmp/go-build/cgo-gcc-prolog:58: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit
to thaJeztah/cli
that referenced
this pull request
Mar 26, 2022
pkcs11 cannot be compiled statically if CGO is enabled (and glibc is used) see https://github.com/docker/cli/blob/3897c3fa544f1239c2bc2c3af2adcebcb3650c4d/vendor/github.com/miekg/pkcs11/pkcs11.go#L75 see docker#3490 (comment) When trying to do otherwise, warnings are printed (and shouldn't be ignored, similar to the `osusergo` build-tag): docker#32 [linux/amd64->s390x build 2/2] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount=type=tmpfs,target=cli/winresources xx-go --wrap && TARGET=/out ./scripts/build/binary && xx-verify $([ "static" = "static" ] && echo "--static") /out/docker docker#32 467.0 # github.com/docker/cli/cmd/docker docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000018.o: in function `New': docker#32 467.0 /go/src/github.com/docker/cli/vendor/github.com/miekg/pkcs11/pkcs11.go:75: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000004.o: in function `_cgo_26061493d47f_C2func_getaddrinfo': docker#32 467.0 /tmp/go-build/cgo-gcc-prolog:58: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit
to thaJeztah/cli
that referenced
this pull request
Mar 28, 2022
pkcs11 cannot be compiled statically if CGO is enabled (and glibc is used) see https://github.com/docker/cli/blob/3897c3fa544f1239c2bc2c3af2adcebcb3650c4d/vendor/github.com/miekg/pkcs11/pkcs11.go#L75 see docker#3490 (comment) When trying to do otherwise, warnings are printed (and shouldn't be ignored, similar to the `osusergo` build-tag): docker#32 [linux/amd64->s390x build 2/2] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount=type=tmpfs,target=cli/winresources xx-go --wrap && TARGET=/out ./scripts/build/binary && xx-verify $([ "static" = "static" ] && echo "--static") /out/docker docker#32 467.0 # github.com/docker/cli/cmd/docker docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000018.o: in function `New': docker#32 467.0 /go/src/github.com/docker/cli/vendor/github.com/miekg/pkcs11/pkcs11.go:75: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000004.o: in function `_cgo_26061493d47f_C2func_getaddrinfo': docker#32 467.0 /tmp/go-build/cgo-gcc-prolog:58: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit
to thaJeztah/cli
that referenced
this pull request
Apr 1, 2022
pkcs11 cannot be compiled statically if CGO is enabled (and glibc is used) see https://github.com/docker/cli/blob/3897c3fa544f1239c2bc2c3af2adcebcb3650c4d/vendor/github.com/miekg/pkcs11/pkcs11.go#L75 see docker#3490 (comment) When trying to do otherwise, warnings are printed (and shouldn't be ignored, similar to the `osusergo` build-tag): docker#32 [linux/amd64->s390x build 2/2] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount=type=tmpfs,target=cli/winresources xx-go --wrap && TARGET=/out ./scripts/build/binary && xx-verify $([ "static" = "static" ] && echo "--static") /out/docker docker#32 467.0 # github.com/docker/cli/cmd/docker docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000018.o: in function `New': docker#32 467.0 /go/src/github.com/docker/cli/vendor/github.com/miekg/pkcs11/pkcs11.go:75: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000004.o: in function `_cgo_26061493d47f_C2func_getaddrinfo': docker#32 467.0 /tmp/go-build/cgo-gcc-prolog:58: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit
to thaJeztah/cli
that referenced
this pull request
Aug 28, 2025
pkcs11 cannot be compiled statically if CGO is enabled (and glibc is used) see https://github.com/docker/cli/blob/3897c3fa544f1239c2bc2c3af2adcebcb3650c4d/vendor/github.com/miekg/pkcs11/pkcs11.go#L75 see docker#3490 (comment) When trying to do otherwise, warnings are printed (and shouldn't be ignored, similar to the `osusergo` build-tag): docker#32 [linux/amd64->s390x build 2/2] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount=type=tmpfs,target=cli/winresources xx-go --wrap && TARGET=/out ./scripts/build/binary && xx-verify $([ "static" = "static" ] && echo "--static") /out/docker docker#32 467.0 # github.com/docker/cli/cmd/docker docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000018.o: in function `New': docker#32 467.0 /go/src/github.com/docker/cli/vendor/github.com/miekg/pkcs11/pkcs11.go:75: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking docker#32 467.0 /usr/bin/s390x-linux-gnu-ld: /tmp/go-link-900380651/000004.o: in function `_cgo_26061493d47f_C2func_getaddrinfo': docker#32 467.0 /tmp/go-build/cgo-gcc-prolog:58: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
nobiit pushed a commit
to nobidev/docker-cli
that referenced
this pull request
Nov 19, 2025
[cherry-pick] vendor: Ensure service images get default tag and print familiar strings
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit bb5dfdb added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.
This patch moves the change to the 3.3 schema
Signed-off-by: Sebastiaan van Stijn github@gone.nl
Move of moby/moby#32972