Merge pull request #98 from zalando-stups/upgrade-dependecies

Upgrade dependencies
zalando-stups · Jul 30, 2018 · e38864e · e38864e
2 parents 59b76fe + 3973403
commit e38864e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ branches:
 
 language: go
 go:
-  - 1.9.2
+  - 1.10.3
 
 env:
   global:
-    - VIPS_VERSION=8.6.0
+    - VIPS_VERSION=8.6.5
     - secure: gwkrGzB65bWhvyuVrXaWOuAXAtRc94gBIj3dZ+HAO0+v9TwPksgiapa0w4AE/yLRap0F/l1MAvhJ4VqAZp4hhSMofR+lOdRcJo2paKZhNWYrPdJRt9kj+LunUJ2z5aOC7tsKfTUTSJPqoW3v5OGZ+ou7aWT6InA+qk4pSqiPzmxlBlGQkk/l3eRc8wHKSUfCRG9kkoGGT42ZZxCPK/lk47F7aA7Oi0M07SwOs7UwygCHiel4SiWmQJ93fb9PDbue9PFqGtEJ+J7YM78oWntfi/OHO2UH8vZMp7/I7PjQiQ8WFt2ASHzHBQ3+mv1Jy/ZzfIx2wuP2irc1bWAqM8dCI4YHz/K+IIJbRNnZbhV0l2OEZ96fSdzKuNfjwfzMAMKaJ+ZlHpwkhJtvUgzSpeX+VPrnh1WjfZosZq7DDVrfmQwoDrP7e0S/0yokiekCCvZCqUQjYMUMckGrodhFjTfwsLgFQUPBzsch+d0uXrySxJbgWL3cL+h5S85sQtyoVuATHR162cxJIrzG0rMFkP3k3zwXdEj0dSLT7xLqr4e+WV6JILPs3Y5AE/yQFPS/glF45latyyUgsIds+SJkteL8MmLozpqckhFYooFlEzU9Lw7hhqsHVRVc+d1Y7mWS6cIP5D6dk7AQAPrzmiwRHfCFoGJaEyxTpZ+UrLETlYKyZj0=
 
 before_install:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 ARG ROUTES_FILE
 

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1,3 +1,2 @@
 Dan Persa <[email protected]>
-Maximilian Fellner <[email protected]>
 Roberto Gritti <[email protected]>
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,13 +2,15 @@ package: github.com/zalando-stups/skrop
 import:
 - package: github.com/sirupsen/logrus
 - package: github.com/zalando/skipper
+  version: ^0.10.48
   subpackages:
   - eskip
   - eskipfile
   - filters
   - proxy
   - routing
 - package: gopkg.in/h2non/bimg.v1
+  version: ^1.0.18
 testImport:
 - package: github.com/stretchr/testify
   subpackages:

diff --git a/packaging/Dockerfile b/packaging/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2-alpine
+FROM golang:1.10.3-alpine
 
 RUN apk add --update git bash
 

diff --git a/packaging/install-vips.sh b/packaging/install-vips.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-readonly VIPS_VERSION="8.6.0"
+readonly VIPS_VERSION="8.6.5"
 readonly VIPS_SOURCE="https://github.com/jcupitt/libvips/releases/download"
 
 readonly IS_UBUNTU=$(cat /etc/*-release | grep -o -m 1 ubuntu)