Dockerfile: use TARGETPLATFORM to build Docker#44546
Merged
thaJeztah merged 13 commits intomoby:masterfrom Jan 2, 2023
Merged
Conversation
Member
|
@crazy-max this one can be rebased 👍 |
crazy-max
force-pushed
the
dockerfile-cross
branch
4 times, most recently
from
0dd8bb2 to
82322a1
Compare
crazy-max
force-pushed
the
dockerfile-cross
branch
3 times, most recently
from
b567f53 to
8d0600f
Compare
thaJeztah
reviewed
Dec 19, 2022
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
was still reviewing, but had one comment pending already; let me submit that one
crazy-max
force-pushed
the
dockerfile-cross
branch
3 times, most recently
from
e153e02 to
bd076dd
Compare
corhere
previously requested changes
Dec 22, 2022
Contributor
corhere
left a comment
corhere
left a comment
There was a problem hiding this comment.
I didn't get past the first commit. There are so many behaviour changes to the hack/make scripts which have nothing to do with the PR description or commit message.
hack/make.sh
Outdated
Comment on lines
134
to
135
| export DOCKER_BUILDFLAGS=(-tags "${DOCKER_BUILDTAGS}" -installsuffix netgo) | ||
| # see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here |
Contributor
There was a problem hiding this comment.
It looks like -installsuffix was necessary to work around bugs in go build which appear to have been fully resolved in go1.5.
crazy-max
force-pushed
the
dockerfile-cross
branch
3 times, most recently
from
0bc5c53 to
01b9872
Compare
Member
Author
@corhere Yes this was indeed ahead of the expectations, sorry about that. It should be easier to review now. |
crazy-max
force-pushed
the
dockerfile-cross
branch
from
01b9872 to
39affad
Compare
crazy-max
commented
Dec 27, 2022
crazy-max
force-pushed
the
dockerfile-cross
branch
2 times, most recently
from
d5e391c to
00c980e
Compare
This was referenced Jan 2, 2023
crazy-max
added a commit
to crazy-max/docker-ce-packaging
that referenced
this pull request
Jan 5, 2023
follow-up moby/moby#44546 Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/buildkit
that referenced
this pull request
Jan 9, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/buildkit
that referenced
this pull request
Jan 9, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/buildkit
that referenced
this pull request
Jan 9, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/buildkit
that referenced
this pull request
Jan 9, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit 489c823)
crazy-max
added a commit
to crazy-max/buildkit
that referenced
this pull request
Jan 10, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit 489c823)
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 12, 2023
Following changes for cross-compilation in moby#44546 the cross script setting GOARM to the expected value has been removed but changes not carried in .binary script Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 12, 2023
Following changes for cross-compilation in moby#44546 the cross script setting GOARM to the expected value has been removed but changes not carried in .binary script Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 16, 2023
Following changes for cross-compilation in moby#44546, we forgot to remove the toolchain configuration that is not used anymore as xx already sets correct cc/cxx envs already. Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 16, 2023
Build currently doesn't set the right name for target ARM architecture through switches in CGO_CFLAGS and CGO_CXXFLAGS when doing cross-compilation. This was previously fixed in moby#43474 Also removes the toolchain configuration. Following changes for cross-compilation in moby#44546, we forgot to remove the toolchain configuration that is not used anymore as xx already sets correct cc/cxx envs already. Signed-off-by: CrazyMax <[email protected]>
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 17, 2023
Build currently doesn't set the right name for target ARM architecture through switches in CGO_CFLAGS and CGO_CXXFLAGS when doing cross-compilation. This was previously fixed in moby#43474 Also removes the toolchain configuration. Following changes for cross-compilation in moby#44546, we forgot to remove the toolchain configuration that is not used anymore as xx already sets correct cc/cxx envs already. Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit 9457042)
thaJeztah
pushed a commit
to thaJeztah/docker
that referenced
this pull request
Jan 17, 2023
Build currently doesn't set the right name for target ARM architecture through switches in CGO_CFLAGS and CGO_CXXFLAGS when doing cross-compilation. This was previously fixed in moby#43474 Also removes the toolchain configuration. Following changes for cross-compilation in moby#44546, we forgot to remove the toolchain configuration that is not used anymore as xx already sets correct cc/cxx envs already. Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit 9457042) Signed-off-by: Sebastiaan van Stijn <[email protected]>
crazy-max
added a commit
to crazy-max/moby
that referenced
this pull request
Jan 18, 2023
This var was used for the cross target but it has been removed in moby#44546 so not necessary anymore Signed-off-by: CrazyMax <[email protected]>
This was referenced Jan 19, 2023
thaJeztah
pushed a commit
to thaJeztah/buildkit
that referenced
this pull request
Feb 4, 2023
related to moby/moby#44546 Signed-off-by: CrazyMax <[email protected]> (cherry picked from commit 489c823) Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
follow-up #43529
needs #44513fixes #41590
fixes #41862
fixes #41519
fixes #39380
closes #43492
closes #43613
Better support for cross compilation so we can fully rely on
--platformflag of buildx for a seamless integration.This removes unnecessary extra cross logic in the Dockerfile, removes
DOCKER_CROSSPLATFORMSandCROSSvars and some hack scripts as well.Non-sandboxed build invocation is still supported and dev stages in the Dockerfile have been updated accordingly.
Bake definition and GitHub Actions workflows have been updated accordingly as well.
cc @thaJeztah @rumpl @vvoland