Skip to content

Commit

Permalink
Merge pull request #873 from hairyhenderson/bump-deps
Browse files Browse the repository at this point in the history
bump deps
  • Loading branch information
Dave Henderson authored and GitHub committed Jun 13, 2020
2 parents b0af6e1 + 151a520 commit 2040c64
Show file tree
Hide file tree
Showing 4 changed files with 307 additions and 73 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.1.5-experimental
FROM --platform=linux/amd64 hairyhenderson/upx:3.96 AS upx

FROM --platform=linux/amd64 golang:1.14.2-alpine3.11 AS build
FROM --platform=linux/amd64 golang:1.14.4-alpine3.12 AS build

ARG TARGETOS
ARG TARGETARCH
Expand All @@ -25,7 +25,7 @@ RUN --mount=type=cache,id=go-build-${TARGETOS}-${TARGETARCH}${TARGETVARIANT},tar
make build
RUN mv bin/gomplate* /bin/

FROM --platform=linux/amd64 alpine:3.11.5 AS compress
FROM --platform=linux/amd64 alpine:3.12.0 AS compress

ARG TARGETOS
ARG TARGETARCH
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.integration
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM vault:1.4.2 AS vault

FROM consul:1.7.3 AS consul
FROM consul:1.7.4 AS consul

FROM golang:1.14.3-alpine3.11
FROM golang:1.14.4-alpine3.12

COPY --from=vault /bin/vault /bin/vault
COPY --from=consul /bin/consul /bin/consul
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/Masterminds/goutils v1.1.0
github.com/Shopify/ejson v1.2.1
github.com/aws/aws-sdk-go v1.31.12
github.com/aws/aws-sdk-go v1.32.1
github.com/boltdb/bolt v1.3.1
github.com/docker/libkv v0.2.1
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
Expand All @@ -16,23 +16,23 @@ require (
github.com/hashicorp/consul/api v1.4.0
github.com/hashicorp/go-sockaddr v1.0.2
github.com/hashicorp/vault/api v1.0.4
github.com/johannesboyne/gofakes3 v0.0.0-20200510090907-02d71f533bec
github.com/johannesboyne/gofakes3 v0.0.0-20200605082314-e89baa38acc1
github.com/joho/godotenv v1.3.0
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.18.0
github.com/rs/zerolog v1.19.0
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/spf13/afero v1.2.2
github.com/spf13/cobra v1.0.0
github.com/stretchr/testify v1.6.1
github.com/ugorji/go/codec v1.1.7
github.com/zealic/xignore v0.3.3
gocloud.dev v0.19.0
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
gocloud.dev v0.20.0
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
gopkg.in/src-d/go-billy.v4 v4.3.2
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
gotest.tools/v3 v3.0.2
k8s.io/client-go v11.0.0+incompatible
)
Loading

0 comments on commit 2040c64

Please sign in to comment.