Skip to content

Include VPNkit binary for arm64#42067

Merged
thaJeztah merged 1 commit into
moby:masterfrom
AkihiroSuda:vpnkit-arm64
Mar 12, 2021
Merged

Include VPNkit binary for arm64#42067
thaJeztah merged 1 commit into
moby:masterfrom
AkihiroSuda:vpnkit-arm64

Conversation

@AkihiroSuda

Copy link
Copy Markdown
Member

Previously, VPNkit binary was installed only for amd64.

Comment thread Dockerfile Outdated

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks! LGTM after the commit is changed to the tagged version (other nit is obviously not a blocker, so leaving that up to you)

Comment thread Dockerfile Outdated
Comment thread Dockerfile Outdated

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@thaJeztah

Copy link
Copy Markdown
Member

@cpuguy83 ptal

@AkihiroSuda
AkihiroSuda requested a review from tonistiigi March 8, 2021 03:28
Comment thread Dockerfile

FROM scratch AS vpnkit
COPY --from=vpnkit-amd64 /vpnkit /build/vpnkit.x86_64
COPY --from=vpnkit-arm64 /vpnkit /build/vpnkit.aarch64

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why are we putting multiple binaries into a stage, including binary for wrong arch? Just the one for the target platform should suffice.

@AkihiroSuda AkihiroSuda Mar 8, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ideally we could write this like COPY --from=vpnkit-${TARGETPLATFORM} /vpnkit /build/vpnkit, but we can't, because djs55/vpnkit:0.5.0 only contains amd64 and arm64 manifests.

@AkihiroSuda
AkihiroSuda requested a review from tonistiigi March 12, 2021 04:49

@tonistiigi tonistiigi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, but we should find some better solution for this as combining unwanted binaries for multiple platforms together does not scale. Either with some builder changes or changes to the vpnkit image cc @djs55

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants