Auto-merge for PR #11 via VersionBot

Move to V2 of CircleCI and include git for tagging.

circle.yml → .circleci/config.yml

@@ -7,7 +7,6 @@ jobs:
     working_directory: /tmp/build
     environment:
       DOCKER_USERNAME: travisciresin
-      DOCKER_EMAIL: [email protected]
       DOCKER_IMAGE: resin/resin-db
     steps:
       - checkout
@@ -17,7 +16,7 @@ jobs:
           exclusive: false
       - run: |
           docker info
-          docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -e="${DOCKER_EMAIL}"
+          docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
       - run:
           name: Build
           command: |
@@ -26,7 +25,7 @@ jobs:
             docker build --rm=false --pull --tag ${DOCKER_IMAGE}:${CIRCLE_SHA1} .
       - deploy:
           command: |
-              docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -e="${DOCKER_EMAIL}"
+              docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
               set -ex
               docker push ${DOCKER_IMAGE}:${CIRCLE_SHA1}
               docker tag ${DOCKER_IMAGE}:${CIRCLE_SHA1} ${DOCKER_IMAGE}:${CIRCLE_BRANCH}
@@ -37,6 +36,7 @@ jobs:
               fi
 
               # Tag the branch
+              apk add --no-cache git
               tag=$(git describe --tags) || true
               if [ "${tag}" != "" ]; then
                 docker tag ${DOCKER_IMAGE}:${CIRCLE_SHA1} ${DOCKER_IMAGE}:${tag}

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.1.1 - 2018-03-08
+
+* Move to V2 of CircleCI and include git for tagging. #11 [Heds Simons]
+
 ## v1.1.0 - 2018-03-05
 
 * Update to postgres 10 #9 [Pagan Gazzard]