Merge pull request #2534 from influxdata/master

telegraf 1.2.0-rc1 and update alpine images to alpine:3.5

library/influxdb

@@ -12,10 +12,10 @@ Directory: influxdb/1.0/alpine
 
 Tags: 1.1, 1.1.1, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: fccddeace2827eb50d09bbd2a722d25fb707369f
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: influxdb/1.1
 
 Tags: 1.1-alpine, 1.1.1-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: fccddeace2827eb50d09bbd2a722d25fb707369f
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: influxdb/1.1/alpine

library/kapacitor

@@ -12,20 +12,20 @@ Directory: kapacitor/1.0/alpine
 
 Tags: 1.1, 1.1.1, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9cb739374cf02d3b88ed1cfbaea98638a7a37850
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: kapacitor/1.1
 
 Tags: 1.1-alpine, 1.1.1-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9cb739374cf02d3b88ed1cfbaea98638a7a37850
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: kapacitor/1.1/alpine
 
 Tags: 1.2.0-rc1
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: d414680dc5c3ef23fcecc4430a09ffc550c9f403
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: kapacitor/1.2
 
 Tags: 1.2.0-rc1-alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: d414680dc5c3ef23fcecc4430a09ffc550c9f403
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: kapacitor/1.2/alpine

library/telegraf

@@ -12,10 +12,20 @@ Directory: telegraf/1.0/alpine
 
 Tags: 1.1, 1.1.2, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9bfe5c39d1fcf1dfdaa1732cb98311a40fbf6a57
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: telegraf/1.1
 
 Tags: 1.1-alpine, 1.1.2-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9bfe5c39d1fcf1dfdaa1732cb98311a40fbf6a57
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
 Directory: telegraf/1.1/alpine
+
+Tags: 1.2.0-rc1
+GitRepo: git://github.com/influxdata/influxdata-docker
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
+Directory: telegraf/1.2
+
+Tags: 1.2.0-rc1-alpine
+GitRepo: git://github.com/influxdata/influxdata-docker
+GitCommit: ceb9e81abf0b7707d5184ffdf4c228ee33cda178
+Directory: telegraf/1.2/alpine