diff --git a/Dockerfile b/Dockerfile index b499ca1a33..6004b80c20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -307,10 +307,10 @@ WORKDIR /src/cmd/installer RUN --mount=type=cache,target=/.cache go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /installer RUN chmod +x /installer -FROM alpine:3.13.3 AS unicode-pf2 +FROM alpine:3.13.4 AS unicode-pf2 RUN apk add --no-cache --update grub -FROM alpine:3.13.3 AS installer +FROM alpine:3.13.4 AS installer RUN apk add --no-cache --update \ bash \ ca-certificates \ @@ -438,7 +438,7 @@ RUN prototool lint --protoc-bin-path=/toolchain/bin/protoc --protoc-wkt-path=/to # The markdownlint target performs linting on Markdown files. -FROM node:15.12.0-alpine AS lint-markdown +FROM node:15.13.0-alpine AS lint-markdown RUN apk add --no-cache findutils RUN npm i -g markdownlint-cli@0.23.2 RUN npm i -g textlint@11.7.6 diff --git a/go.mod b/go.mod index c30eb32891..da5af057c1 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/gdamore/tcell/v2 v2.2.0 github.com/gizak/termui/v3 v3.1.0 github.com/gogo/googleapis v1.4.0 // indirect - github.com/golang/protobuf v1.5.1 + github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.5 github.com/google/uuid v1.2.0 github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 @@ -65,7 +65,6 @@ require ( github.com/smira/go-xz v0.0.0-20201019130106-9921ed7a9935 github.com/spf13/cobra v1.1.3 github.com/stretchr/testify v1.7.0 - github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // can't be bumped, requires new runc github.com/talos-systems/crypto v0.2.1-0.20210202170911-39584f1b6e54 github.com/talos-systems/go-blockdevice v0.2.1-0.20210322192639-776b37d31de0 github.com/talos-systems/go-cmd v0.0.0-20210216164758-68eb0067e0f0 diff --git a/go.sum b/go.sum index 18ba602ff1..085fb6b90c 100644 --- a/go.sum +++ b/go.sum @@ -486,8 +486,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod index c42dcd85a4..5a5814886a 100644 --- a/hack/cloud-image-uploader/go.mod +++ b/hack/cloud-image-uploader/go.mod @@ -3,7 +3,7 @@ module github.com/talos-systems/cloud-image-uploader go 1.16 require ( - github.com/aws/aws-sdk-go v1.38.7 + github.com/aws/aws-sdk-go v1.38.12 github.com/google/uuid v1.2.0 github.com/spf13/pflag v1.0.5 github.com/talos-systems/go-retry v0.1.1-0.20201113203059-8c63d290a688 diff --git a/hack/cloud-image-uploader/go.sum b/hack/cloud-image-uploader/go.sum index ab7917ace2..5d1b989726 100644 --- a/hack/cloud-image-uploader/go.sum +++ b/hack/cloud-image-uploader/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.38.7 h1:uOu2IrTiNhcSNAjBmA21t48lTx5mgGdcFKamDjXMscA= -github.com/aws/aws-sdk-go v1.38.7/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.38.12 h1:khtODkUna3iF53Cg3dCF4e6oWgrAEbZDU4x1aq+G0WY= +github.com/aws/aws-sdk-go v1.38.12/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index fe045baae2..48a3e875fd 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -14,7 +14,7 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/evanphx/json-patch v4.9.0+incompatible github.com/ghodss/yaml v1.0.0 - github.com/golang/protobuf v1.5.1 + github.com/golang/protobuf v1.5.2 github.com/hashicorp/go-multierror v1.1.1 github.com/onsi/ginkgo v1.15.0 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2 diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index 0aa59b4bc4..05bb6c7ca1 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -45,8 +45,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=