From 3782d823ca6d5ca03d4f0570e457df7d0cfb8066 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Fri, 16 Sep 2016 14:21:37 +0100
Subject: [PATCH 1/2] Return email parameter to docker login

We use Docker 1.10 on Circle CI which doesn't have that parameter
deprecated. This parameter was removed in commit fec8ac0f8.
---
 CHANGELOG.md | 4 ++++
 circle.yml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46189c5..c0d1a4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1
+
+* Fix docker login during push to Docker Hub.
+
 ## 1.0.0
 
 * Package `oauth2_proxy` v2.1 with Alpine 3.4 base image.
diff --git a/circle.yml b/circle.yml
index 58a83dd..c36a9b7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,6 +17,6 @@ deployment:
   tagged:
     tag: /.*/
     commands:
-      - docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       - docker tag $IMAGE_NAME $IMAGE_NAME:$CIRCLE_TAG
       - docker push $IMAGE_NAME:$CIRCLE_TAG

From cf1fdb2869ab197eac7ad7ad8905250eddbbea2a Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Fri, 16 Sep 2016 14:32:25 +0100
Subject: [PATCH 2/2] Use version of packaged binary

---
 CHANGELOG.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d1a4e..83a44ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,5 @@
 # Changelog
 
-## 1.0.1
-
-* Fix docker login during push to Docker Hub.
-
-## 1.0.0
+## 2.1
 
 * Package `oauth2_proxy` v2.1 with Alpine 3.4 base image.