Merge pull request #18 from devopsfaith/0.5-dev

Integrate the 0.5 dev branch into master
krakend · Jun 8, 2018 · a77d158 · a77d158
2 parents a4fba9e + 337ee9e
commit a77d158
Show file tree

Hide file tree

Showing 14 changed files with 240 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: go
 
 go:
-    - 1.9
+    - "1.10.x"
 
 before_install:
   - make prepare
 
 script:
-    - make
+    - make
diff --git a/Dockerfile b/Dockerfile
@@ -10,4 +10,4 @@ VOLUME [ "/etc/krakend" ]
 ENTRYPOINT [ "/usr/bin/krakend" ]
 CMD [ "run", "-c", "/etc/krakend/krakend.json" ]
 
-EXPOSE 8080
+EXPOSE 8000 8090
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -16,8 +16,24 @@
   version = "1.2.0"
 
 [[constraint]]
+  branch = "master"
+  name = "github.com/devopsfaith/krakend-flexibleconfig"
+
+[[constraint]]
+  version = "0.5.0"
+  name = "github.com/devopsfaith/krakend-xml"
+
+[[constraint]]
+  version = "0.5.0"
+  name = "github.com/devopsfaith/krakend-rss"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/letgoapp/krakend-influx"
+
+[[constraint]]
+  version = "0.5"
   name = "github.com/devopsfaith/krakend"
-  version = "0.4.2"
 
 [[constraint]]
   branch = "master"
@@ -48,7 +64,7 @@
   name = "github.com/devopsfaith/krakend-martian"
 
 [[constraint]]
-  branch = "master"
+  version = "0.5.0"
   name = "github.com/devopsfaith/krakend-metrics"
 
 [[constraint]]
@@ -59,14 +75,10 @@
   branch = "master"
   name = "github.com/devopsfaith/krakend-ratelimit"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/devopsfaith/krakend-rss"
-
 [[constraint]]
   branch = "master"
   name = "github.com/devopsfaith/krakend-viper"
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/devopsfaith/krakend-xml"
+  version = "0.5.0"
+  name = "github.com/devopsfaith/krakend-opencensus"