Merge pull request #506 from hairyhenderson/update-deps

Upgrading Go & Dockerfile dependencies
hairyhenderson · Mar 3, 2019 · 5c27e1e · 5c27e1e
2 parents ca0d816 + a50193c
commit 5c27e1e
Show file tree

Hide file tree

Showing 72 changed files with 2,945 additions and 248 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.8 AS upx
 RUN apk add --no-cache upx=3.94-r0
 
-FROM golang:1.12.0-alpine@sha256:8cc1c0f534c0fef088f8fe09edc404f6ff4f729745b85deae5510bfd4c157fb2 AS build
+FROM golang:1.12.0-alpine AS build
 
 RUN apk add --no-cache \
     make \
@@ -39,7 +39,7 @@ COPY --from=artifacts /bin/gomplate_${OS}-${ARCH} /gomplate
 
 ENTRYPOINT [ "/gomplate" ]
 
-FROM alpine:3.8@sha256:46e71df1e5191ab8b8034c5189e325258ec44ea739bba1e5645cff83c9048ff1 AS gomplate-alpine
+FROM alpine:3.9 AS gomplate-alpine
 
 ARG BUILD_DATE
 ARG VCS_REF

diff --git a/Dockerfile.integration b/Dockerfile.integration
@@ -1,8 +1,8 @@
-FROM vault:1.0.0 AS vault
+FROM vault:1.0.3 AS vault
 
-FROM consul:1.4.0 AS consul
+FROM consul:1.4.2 AS consul
 
-FROM golang:1.11.2-alpine
+FROM golang:1.12.0-alpine
 
 COPY --from=vault /bin/vault /bin/vault
 COPY --from=consul /bin/consul /bin/consul

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go