Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] api: Change Platform field back to string (temporary workaround)#9

Closed
tiborvass wants to merge 2 commits into
docker-archive:18.06from
tiborvass:18.06-api-platform-string
Closed

[18.06] api: Change Platform field back to string (temporary workaround)#9
tiborvass wants to merge 2 commits into
docker-archive:18.06from
tiborvass:18.06-api-platform-string

Conversation

@tiborvass
Copy link
Copy Markdown

This partially reverts moby#37350

Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.

That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.

With this change, no parsing is expected from the client.

Signed-off-by: Tibor Vass tibor@docker.com
(cherry picked from commit facad55)
Signed-off-by: Tibor Vass tibor@docker.com

Only a simple import path conflict:

diff --cc builder/builder-next/builder.go
index 5a82cddf44,b1d31a5225..0000000000
--- a/builder/builder-next/builder.go
+++ b/builder/builder-next/builder.go
@@@ -14,7 -13,8 +14,12 @@@ import
        "github.com/docker/docker/api/types/backend"
        "github.com/docker/docker/builder"
        "github.com/docker/docker/daemon/images"
++<<<<<<< HEAD
 +      "github.com/docker/docker/pkg/jsonmessage"
++=======
+       "github.com/docker/docker/pkg/streamformatter"
+       "github.com/docker/docker/pkg/system"
++>>>>>>> facad55744... api: Change Platform field back to string (temporary workaround)
        controlapi "github.com/moby/buildkit/api/services/control"
        "github.com/moby/buildkit/control"
        "github.com/moby/buildkit/identity"

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ca8022e)
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass added this to the 18.06.0 milestone Jul 4, 2018
@thaJeztah
Copy link
Copy Markdown
Member

cherry pick of moby#37381

This partially reverts moby#37350

Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.

That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.

With this change, no parsing is expected from the client.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit facad55)
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass force-pushed the 18.06-api-platform-string branch from 7522403 to f030a49 Compare July 4, 2018 00:44
@tiborvass
Copy link
Copy Markdown
Author

tiborvass commented Jul 4, 2018

Closing in favor of #7 for conflict reasons

@tiborvass tiborvass closed this Jul 4, 2018
@tiborvass tiborvass deleted the 18.06-api-platform-string branch July 4, 2018 00:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants