Makefile: Cleanup, alpine and amd64 only UDP #860
Merged
Conversation
This file contains 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
tomdee
force-pushed
the
simplify-packaging
branch
from
f62eb26 to
df4dfb9
Compare
gunjan5
reviewed
Nov 9, 2017
Dockerfile.amd64
Outdated
| @@ -1,12 +1,11 @@ | |||
| FROM frolvlad/alpine-glibc | |||
| FROM alpine | |||
|
|
|||
| MAINTAINER Tom Denham <[email protected]> | |||
There was a problem hiding this comment.
nit: MAINTAINER has been deprecated, we should probably switch to LABEL
There was a problem hiding this comment.
Already done in another PR 😄
gunjan5
reviewed
Nov 9, 2017
| endif | ||
|
|
||
| # Go version to use for builds | ||
| GO_VERSION=1.8.3 |
There was a problem hiding this comment.
any reason we're not using Go 1.9.2?
There was a problem hiding this comment.
I don't want to introduce too many changes in this PR. I'll rev the Go version in a different PR
gunjan5
reviewed
Nov 9, 2017
| @@ -0,0 +1,87 @@ | |||
| // Copyright 2015 flannel authors | |||
gunjan5
reviewed
Nov 9, 2017
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "golang.org/x/net/context" |
There was a problem hiding this comment.
context has been move to "context" as part of the std lib since Go 1.7
There was a problem hiding this comment.
Sure, but it hasn't been updated in flannel yet and that change shouldn't be done in this PR
gunjan5
approved these changes
Nov 9, 2017
Reorganize the Makefile to have different sections for build, test, release and development. Move to using Alpine linux as the base image. This means we no longer need to build iptables and it makes it easier to install other packages in future (e.g. strongswan). To allow alpine to be used, static binaries for all platforms are needed. It's not possible to create these for the UDP backend for non-amd64 platforms. This is because it relies on CGO. So this PR makes the UDP backend work on amd64 only.
tomdee
force-pushed
the
simplify-packaging
branch
from
df4dfb9 to
3e883b8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reorganize the Makefile to have different sections for build, test,
release and development.
Move to using Alpine linux as the base image. This means we no longer
need to build iptables and it makes it easier to install other packages
in future (e.g. strongswan).
To allow alpine to be used, static binaries for all platforms are
needed. It's not possible to create these for the UDP backend for
non-amd64 platforms. This is because it relies on CGO. So this PR makes
the UDP backend work on amd64 only.