summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2019-07-09 10:25:46 -0400
committerGitHub <noreply@github.com>2019-07-09 10:25:46 -0400
commit38a8aa2df0fe6f38b0b00a3d935456513ff6c819 (patch)
treeab822a6374c639209afda3d68b40644da0d82329
parent7eeeda1cc5c65cb57e6a4dab52ee5443ac9905b0 (diff)
parent98dde12910dbb5ce283c35b141e6fba95588b2cd (diff)
Merge pull request #575 from hairyhenderson/renovate/docker-golang-1.x
Update golang Docker tag to v1.12.7
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.integration2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 4e353500..5ed4191d 100644
--- 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.6-alpine AS build
+FROM golang:1.12.7-alpine AS build
RUN apk add --no-cache \
make \
diff --git a/Dockerfile.integration b/Dockerfile.integration
index 484d5d99..3a8bcd10 100644
--- a/Dockerfile.integration
+++ b/Dockerfile.integration
@@ -2,7 +2,7 @@ FROM vault:1.1.3 AS vault
FROM consul:1.5.2 AS consul
-FROM golang:1.12.0-alpine
+FROM golang:1.12.7-alpine
COPY --from=vault /bin/vault /bin/vault
COPY --from=consul /bin/consul /bin/consul