Skip to content

Commit

Permalink
Merge pull request kelseyhightower#710 from okushchenko/arm-support
Browse files Browse the repository at this point in the history
Release arm64 binaries
  • Loading branch information
okushchenko authored May 4, 2018
2 parents 4528af0 + 09f6676 commit 28f7260
Show file tree
Hide file tree
Showing 523 changed files with 89,371 additions and 39,928 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.build.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.9.1-alpine
FROM golang:1.10.2-alpine

RUN apk add --no-cache make git
RUN mkdir -p /go/src/github.com/kelseyhightower/confd && \
Expand Down
103 changes: 62 additions & 41 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 3 additions & 27 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

[[constraint]]
name = "github.com/coreos/etcd"
version = "=3.3.1"
version = "=3.3.4"

[[constraint]]
name = "github.com/fsnotify/fsnotify"
Expand All @@ -28,11 +28,11 @@

[[constraint]]
name = "github.com/hashicorp/consul"
version = "=0.9.3"
version = "=1.0.7"

[[constraint]]
name = "github.com/hashicorp/vault"
version = "=0.8.1"
version = "=0.10.1"

[[constraint]]
name = "github.com/kelseyhightower/memkv"
Expand All @@ -42,30 +42,6 @@
name = "github.com/samuel/go-zookeeper"
revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"

[[constraint]]
name = "golang.org/x/net"
revision = "66aacef3dd8a676686c7ae3716979581e8b03c47"

[[constraint]]
name = "gopkg.in/yaml.v2"
branch = "v2"

[[override]]
name = "github.com/ugorji/go"
revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57"

[[override]]
name = "google.golang.org/grpc"
version = "=1.7.5"

[[override]]
name = "golang.org/x/crypto"
revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"

[[override]]
name = "golang.org/x/sys"
revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"

[[override]]
name = "github.com/golang/protobuf"
revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ release:
if [ $$platform == windows ]; then extension=.exe; fi; \
docker run -it --rm -v ${PWD}:/app -e "GOOS=$$platform" -e "GOARCH=amd64" -e "CGO_ENABLED=0" confd_builder go build -ldflags="-s -w -X main.GitSHA=${GIT_SHA}" -o bin/confd-${VERSION}-$$platform-amd64$$extension; \
done
@docker run -it --rm -v ${PWD}:/app -e "GOOS=linux" -e "GOARCH=arm64" -e "CGO_ENABLED=0" confd_builder go build -ldflags="-s -w -X main.GitSHA=${GIT_SHA}" -o bin/confd-${VERSION}-linux-arm64;
@upx bin/confd-${VERSION}-*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

## Building

Go 1.8 is required to build confd, which uses the new vendor directory.
Go 1.10 is required to build confd, which uses the new vendor directory.

```
$ mkdir -p $GOPATH/src/github.com/kelseyhightower
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/client/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 28f7260

Please sign in to comment.