Skip to content

Commit

Permalink
Merge pull request #725 from hairyhenderson/dependabot/docker/golang-…
Browse files Browse the repository at this point in the history
…1.13.6-alpine3.10
  • Loading branch information
dependabot-preview[bot] authored and GitHub committed Jan 16, 2020
2 parents a64f59d + bef3deb commit 3cd9f6f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.8 AS upx
RUN apk add --no-cache upx=3.94-r0

FROM golang:1.13.5-alpine3.10 AS build
FROM golang:1.13.6-alpine3.11 AS build

RUN apk add --no-cache \
make \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.integration
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM vault:1.3.1 AS vault

FROM consul:1.6.2 AS consul

FROM golang:1.13.5-alpine
FROM golang:1.13.6-alpine3.11

COPY --from=vault /bin/vault /bin/vault
COPY --from=consul /bin/consul /bin/consul
Expand Down

0 comments on commit 3cd9f6f

Please sign in to comment.