Merge pull request gliderlabs#658 from Snapkitchen/PR-568

resolve merge conflicts in PR-568 (update vendor libraries to fix tls support)

circle.yml → .circleci/config.yml

@@ -1,9 +1,13 @@
 version: 2
 jobs:
  build:
- machine: true
+ docker:
+ - image: gliderlabs/ci:build-2
+ command: ["/bin/bash"]
+ working_directory: /go/src/github.com/gliderlabs/registrator
  steps:
  - checkout
+ - setup_remote_docker
  - run:
  command: make circleci
  - run:
@@ -14,14 +18,12 @@ jobs:
  - deploy:
  name: Deploy website
  command: |
- if [[ "$CIRCLE_BRANCH" == "master" ]]; then
- mv .dockerignore .dockerignore-repo
- docker run -v /home/circleci/.ssh:/tmp/ssh -v $PWD:/work -e MASTER=$MASTER -e TAG=$TAG gliderlabs/pagebuilder deploy "build $CIRCLE_BUILD_NUM"
- mv .dockerignore-repo .dockerignore
+ if is-branch "master"; then
+ eval $(docker run gliderlabs/pagebuilder circleci-cmd)
  fi
  - deploy:
  name: Deploy beta channel
  command: |
- if [[ "$CIRCLE_BRANCH" == "release" ]]; then
+ if is-branch "release"; then
  make release
  fi

.dockerignore

@@ -1,3 +1,5 @@
-release
-build
 .git
+.gvm_local
+build
+release
+vendor

.gitignore

@@ -1,3 +1,4 @@
-release
+.gvm_local
 build
-vendor
+release
+vendor

Dockerfile

@@ -1,18 +1,18 @@
-FROM alpine:3.7 AS builder
-COPY . /go/src/github.com/gliderlabs/registrator
-RUN apk --no-cache add -t build-deps build-base go git curl \
- && apk --no-cache add ca-certificates \
- && export GOPATH=/go && mkdir -p /go/bin && export PATH=$PATH:/go/bin \
+FROM golang:1.9.4-alpine3.7 AS builder
+WORKDIR /go/src/github.com/gliderlabs/registrator/
+COPY . .
+RUN \
+ apk add --no-cache curl git \
  && curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
- && cd /go/src/github.com/gliderlabs/registrator \
- && export GOPATH=/go \
- && git config --global http.https://gopkg.in.followRedirects true \
- && dep ensure \
- && go build -ldflags "-X main.Version=$(cat VERSION)" -o /bin/registrator \
- && rm -rf /go \
- && apk del --purge build-deps
+ && dep ensure -vendor-only \
+ && CGO_ENABLED=0 GOOS=linux go build \
+ -a -installsuffix cgo \
+ -ldflags "-X main.Version=$(cat VERSION)" \
+ -o bin/registrator \
+ .
 
 FROM alpine:3.7
-COPY --from=builder /bin/registrator /bin/registrator
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+RUN apk add --no-cache ca-certificates
+COPY --from=builder /go/src/github.com/gliderlabs/registrator/bin/registrator /bin/registrator
+
 ENTRYPOINT ["/bin/registrator"]