Merge pull request gliderlabs#625 from gliderlabs/circle-test

Properly use CircleCI 2.0 for builds

circle.yml

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